diff --git a/CHANGES.md b/CHANGES.md index 2983d19539d7..bf3021fc6273 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -252,7 +252,7 @@ check 2.7.5 milestone for details. ### Notice -'zkclient' extension for 'org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter' is removed from Dubbo 2.7.1, and 'curator' extension becomes the default extension. If you happen to config your application to use 'zkclient' explicitly, pls. switch to use 'curator' instead. +'zkclient' extension for 'org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter' is removed from Dubbo 2.7.1, and 'curator' extension becomes the default extension. If you happen to config your application to use 'zkclient' explicitly, pls. switch to use 'curator' instead. ### New Features diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java index 25cabd64ce1a..c3cd045def3e 100644 --- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java +++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java @@ -17,4 +17,4 @@ package com.alibaba.dubbo.remoting.zookeeper; @Deprecated -public interface ZookeeperTransporter extends org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter {} +public interface ZookeeperTransporter extends org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter {} 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 f29671f0c649..65b92064caad 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 @@ -24,7 +24,7 @@ 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.ZookeeperTransporter; import org.apache.dubbo.rpc.model.ApplicationModel; import java.util.Collection; @@ -107,7 +107,7 @@ protected void doClose() throws Exception { // zkClient is shared in framework, should not close it here // zkClient.close(); - // See: org.apache.dubbo.remoting.zookeeper.AbstractZookeeperTransporter#destroy() + // See: org.apache.dubbo.remoting.zookeeper.curator5.AbstractZookeeperTransporter#destroy() // All zk clients is created and destroyed in ZookeeperTransporter. zkClient = null; } 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 1ab74973799a..8e893c16c0bd 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.ZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter; import org.apache.dubbo.rpc.model.ApplicationModel; public class ZookeeperDynamicConfigurationFactory extends AbstractDynamicConfigurationFactory { @@ -30,7 +30,7 @@ public class ZookeeperDynamicConfigurationFactory extends AbstractDynamicConfigu public ZookeeperDynamicConfigurationFactory(ApplicationModel applicationModel) { this.applicationModel = applicationModel; - this.zookeeperTransporter = ZookeeperTransporter.getExtension(applicationModel); + this.zookeeperTransporter = ZookeeperTransporter.getInstance(applicationModel); } @Override diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml index d6fb3e6e0e83..15915c4ac1c1 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -779,9 +779,6 @@ META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler - - META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter - META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index 1f82941d24c7..2c76ab798058 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -827,9 +827,6 @@ META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler - - META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter - META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml index 6ef9c5d928e9..d659f120623a 100644 --- a/dubbo-distribution/dubbo-core-spi/pom.xml +++ b/dubbo-distribution/dubbo-core-spi/pom.xml @@ -396,9 +396,6 @@ META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler - - META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter - META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener 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 ce01bf0d7c8f..711119e74dc6 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 @@ -35,7 +35,7 @@ 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.ZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter; 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 42270d863e3f..deb976dd422d 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.ZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter; import org.apache.dubbo.rpc.model.ApplicationModel; /** @@ -34,7 +34,7 @@ public class ZookeeperMetadataReportFactory extends AbstractMetadataReportFactor public ZookeeperMetadataReportFactory(ApplicationModel applicationModel) { this.applicationModel = applicationModel; - this.zookeeperTransporter = ZookeeperTransporter.getExtension(applicationModel); + this.zookeeperTransporter = ZookeeperTransporter.getInstance(applicationModel); } @DisableInject 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 4052df8d2626..1c00abb26e1c 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 @@ -29,7 +29,7 @@ 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.ZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter; import org.apache.dubbo.rpc.RpcException; import java.util.ArrayList; @@ -156,7 +156,7 @@ public void destroy() { zkListeners.clear(); // Just release zkClient reference, but can not close zk client here for zk client is shared somewhere else. - // See org.apache.dubbo.remoting.zookeeper.AbstractZookeeperTransporter#destroy() + // See org.apache.dubbo.remoting.zookeeper.curator5.AbstractZookeeperTransporter#destroy() zkClient = null; } 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 ec4ce4ac342d..8f3278e1ed90 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.ZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter; import org.apache.dubbo.rpc.model.ApplicationModel; /** @@ -37,7 +37,7 @@ public ZookeeperRegistryFactory() { public ZookeeperRegistryFactory(ApplicationModel applicationModel) { this.applicationModel = applicationModel; - this.zookeeperTransporter = ZookeeperTransporter.getExtension(applicationModel); + this.zookeeperTransporter = ZookeeperTransporter.getInstance(applicationModel); } @DisableInject diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml index 4f140f5f49e1..1ea102a6bbb1 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper-api/pom.xml @@ -45,5 +45,6 @@ ${project.parent.version} test + diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java deleted file mode 100644 index 89f3dbd42541..000000000000 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.dubbo.remoting.zookeeper; - -import org.apache.dubbo.common.URL; -import org.apache.dubbo.common.extension.ExtensionLoader; -import org.apache.dubbo.common.extension.ExtensionScope; -import org.apache.dubbo.common.extension.SPI; -import org.apache.dubbo.rpc.model.ApplicationModel; - -@SPI(scope = ExtensionScope.APPLICATION) -public interface ZookeeperTransporter { - - String CURATOR_5 = "curator5"; - - ZookeeperClient connect(URL url); - - void destroy(); - - static ZookeeperTransporter getExtension(ApplicationModel applicationModel) { - ExtensionLoader extensionLoader = - applicationModel.getExtensionLoader(ZookeeperTransporter.class); - return extensionLoader.getExtension(CURATOR_5); - } - - static boolean isHighVersionCurator() { - try { - Class.forName("org.apache.curator.framework.recipes.cache.CuratorCache"); - return true; - } catch (ClassNotFoundException e) { - return false; - } - } -} diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer b/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer deleted file mode 100644 index 1568955be799..000000000000 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer +++ /dev/null @@ -1 +0,0 @@ -dubbo-remoting-api=org.apache.dubbo.remoting.RemotingScopeModelInitializer diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/AbstractZookeeperTransporter.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperTransporter.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/AbstractZookeeperTransporter.java index 802ec8820c2b..4891e1976f0f 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperTransporter.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/AbstractZookeeperTransporter.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; @@ -22,6 +22,7 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.url.component.ServiceConfigURL; import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; import java.util.ArrayList; import java.util.Collections; @@ -78,7 +79,7 @@ public ZookeeperClient connect(URL url) { /** * @param url the url that will create zookeeper connection . * The url in AbstractZookeeperTransporter#connect parameter is rewritten by this one. - * such as: zookeeper://127.0.0.1:2181/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter + * such as: zookeeper://127.0.0.1:2181/org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperTransporter * @return */ protected abstract ZookeeperClient createZookeeperClient(URL url); diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperTransporter.java index 223981a25587..8bc2d9129e14 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperTransporter.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperTransporter.java @@ -17,7 +17,6 @@ package org.apache.dubbo.remoting.zookeeper.curator5; import org.apache.dubbo.common.URL; -import org.apache.dubbo.remoting.zookeeper.AbstractZookeeperTransporter; import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; public class Curator5ZookeeperTransporter extends AbstractZookeeperTransporter { diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/RemotingScopeModelInitializer.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperTransporter.java similarity index 57% rename from dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/RemotingScopeModelInitializer.java rename to dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperTransporter.java index 820f45e2b856..076cf9fe0d94 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-api/src/main/java/org/apache/dubbo/remoting/RemotingScopeModelInitializer.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/ZookeeperTransporter.java @@ -14,42 +14,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.remoting; +package org.apache.dubbo.remoting.zookeeper.curator5; +import org.apache.dubbo.common.URL; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; -import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; import org.apache.dubbo.rpc.model.ApplicationModel; -import org.apache.dubbo.rpc.model.FrameworkModel; -import org.apache.dubbo.rpc.model.ModuleModel; -import org.apache.dubbo.rpc.model.ScopeModelInitializer; - -import java.util.List; import static org.apache.dubbo.common.constants.LoggerCodeConstants.TRANSPORT_FAILED_DESTROY_ZOOKEEPER; -/** - * Scope model initializer for remoting-api - */ -public class RemotingScopeModelInitializer implements ScopeModelInitializer { +public interface ZookeeperTransporter { - private static final ErrorTypeAwareLogger logger = - LoggerFactory.getErrorTypeAwareLogger(RemotingScopeModelInitializer.class); + ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(ZookeeperTransporter.class); - @Override - public void initializeFrameworkModel(FrameworkModel frameworkModel) {} + ZookeeperClient connect(URL url); - @Override - public void initializeApplicationModel(ApplicationModel applicationModel) { + void destroy(); + + static ZookeeperTransporter getInstance(ApplicationModel applicationModel) { + ZookeeperTransporter transporter = new Curator5ZookeeperTransporter(); applicationModel.addDestroyListener(m -> { // destroy zookeeper clients if any try { - List transporters = applicationModel - .getExtensionLoader(ZookeeperTransporter.class) - .getLoadedExtensionInstances(); - for (ZookeeperTransporter zkTransporter : transporters) { - zkTransporter.destroy(); - } + transporter.destroy(); } catch (Exception e) { logger.error( TRANSPORT_FAILED_DESTROY_ZOOKEEPER, @@ -59,8 +47,6 @@ public void initializeApplicationModel(ApplicationModel applicationModel) { e); } }); + return transporter; } - - @Override - public void initializeModuleModel(ModuleModel moduleModel) {} } diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter deleted file mode 100644 index 5c998c754320..000000000000 --- a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter +++ /dev/null @@ -1 +0,0 @@ -curator5=org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperTransporter diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/support/AbstractZookeeperTransporterTest.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/support/AbstractZookeeperTransporterTest.java index 5b3eac89683f..404d70776149 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/support/AbstractZookeeperTransporterTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/test/java/org/apache/dubbo/remoting/zookeeper/curator5/support/AbstractZookeeperTransporterTest.java @@ -17,8 +17,8 @@ package org.apache.dubbo.remoting.zookeeper.curator5.support; import org.apache.dubbo.common.URL; -import org.apache.dubbo.remoting.zookeeper.AbstractZookeeperTransporter; import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; +import org.apache.dubbo.remoting.zookeeper.curator5.AbstractZookeeperTransporter; import org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperTransporter; import java.util.List;