This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a4391fc978e Rename zookeeper-curator to zookeeper (#21936)
a4391fc978e is described below
commit a4391fc978e72a778527b911a0ead5077b33a14f
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Nov 3 19:04:36 2022 +0800
Rename zookeeper-curator to zookeeper (#21936)
* Rename zookeeper-curator to zookeeper
* Rename zookeeper-curator to zookeeper
* Rename zookeeper-curator to zookeeper
---
docs/document/content/dev-manual/mode.cn.md | 2 +-
docs/document/content/dev-manual/mode.en.md | 2 +-
.../optional-plugins/_index.cn.md | 2 +-
.../optional-plugins/_index.en.md | 2 +-
examples/pom.xml | 2 +-
.../cluster-mode-raw-jdbc-example/pom.xml | 2 +-
.../ClusterModeRawJavaConfigurationExample.java | 2 +-
.../ClusterModeRawYamlConfigurationExample.java | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
kernel/data-pipeline/core/pom.xml | 2 +-
mode/type/cluster/repository/provider/pom.xml | 2 +-
.../{zookeeper-curator => zookeeper}/pom.xml | 2 +-
.../cluster/zookeeper/ZookeeperRepository.java} | 24 +++++++++++-----------
.../handler/ZookeeperExceptionHandler.java} | 4 ++--
.../listener/SessionConnectionListener.java | 4 ++--
.../lock/ZooKeeperDistributedLockCreator.java} | 6 +++---
.../zookeeper/lock/ZookeeperDistributedLock.java} | 12 +++++------
.../zookeeper/props/ZookeeperProperties.java | 0
.../zookeeper/props/ZookeeperPropertyKey.java | 0
...ode.repository.cluster.ClusterPersistRepository | 2 +-
...ory.cluster.lock.creator.DistributedLockCreator | 2 +-
.../zookeeper/ZookeeperRepositoryTest.java} | 14 ++++++-------
.../handler/ZookeeperExceptionHandlerTest.java} | 10 ++++-----
.../zookeeper/props/ZookeeperPropertiesTest.java | 0
.../src/test/resources/logback-test.xml | 0
proxy/bootstrap/pom.xml | 2 +-
.../pipeline/framework/watcher/ScalingWatcher.java | 4 ++--
test/pipeline/pom.xml | 2 +-
29 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/docs/document/content/dev-manual/mode.cn.md
b/docs/document/content/dev-manual/mode.cn.md
index d808aef179b..1670dd68b69 100644
--- a/docs/document/content/dev-manual/mode.cn.md
+++ b/docs/document/content/dev-manual/mode.cn.md
@@ -35,7 +35,7 @@ chapter = true
| *配置标识* | *详细说明* | *全限定类名* |
| --------- | --------------------- | ---------- |
-| ZooKeeper | 基于 ZooKeeper 的持久化 |
[`org.apache.shardingsphere.mode.repository.cluster.zookeeper.CuratorZookeeperRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java)
|
+| ZooKeeper | 基于 ZooKeeper 的持久化 |
[`org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java)
|
| etcd | 基于 Etcd 的持久化 |
[`org.apache.shardingsphere.mode.repository.cluster.etcd.EtcdRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java)
|
| Nacos | 基于 Nacos 的持久化 |
[`org.apache.shardingsphere.mode.repository.cluster.nacos.NacosRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java)
|
| Consul | 基于 Consul 的持久化 |
[`org.apache.shardingsphere.mode.repository.cluster.consul.ConsulRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java)
|
diff --git a/docs/document/content/dev-manual/mode.en.md
b/docs/document/content/dev-manual/mode.en.md
index 1bdb37c02b7..597ef30a5f4 100644
--- a/docs/document/content/dev-manual/mode.en.md
+++ b/docs/document/content/dev-manual/mode.en.md
@@ -35,7 +35,7 @@ Cluster mode configuration information persistence definition
| *Configuration Type* | *Description* | *Fully-qualified class
name* |
| -------------------- | --------------------------- |
---------------------------- |
-| ZooKeeper | ZooKeeper based persistence |
[`org.apache.shardingsphere.mode.repository.cluster.zookeeper.CuratorZookeeperRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java)
|
+| ZooKeeper | ZooKeeper based persistence |
[`org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java)
|
| etcd | Etcd based persistence |
[`org.apache.shardingsphere.mode.repository.cluster.etcd.EtcdRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java)
|
| Nacos | Nacos based persistence |
[`org.apache.shardingsphere.mode.repository.cluster.nacos.NacosRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java)
|
| Consul | Consul based persistence |
[`org.apache.shardingsphere.mode.repository.cluster.consul.ConsulRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java)
|
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
index 8c7d989bd89..020fb49a42b 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
@@ -20,7 +20,7 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-postgresql`，用于
ShardingSphere-Proxy 解析与适配访问数据库的协议的 PostgresSQL 实现
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-opengauss`，用于
ShardingSphere-Proxy 解析与适配访问数据库的协议的 openGauss 实现
- `org.apache.shardingsphere:shardingsphere-proxy-backend`，ShardingSphere
Proxy 的后端
--
`org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper-curator`，集群模式配置信息持久化定义的
zookeeper 实现
+-
`org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper`，集群模式配置信息持久化定义的
zookeeper 实现
-
`org.apache.shardingsphere:shardingsphere-cluster-mode-repository-etcd`，集群模式配置信息持久化定义的
etcd 实现
- `org.apache.shardingsphere:shardingsphere-jdbc-core`
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
index 9bc4df04a59..023ae8f347a 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
@@ -22,7 +22,7 @@ All built-in plugins are listed below in the form of
`groupId:artifactId`.
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-postgresql`, a
PostgresSQL implementation for ShardingSphere-Proxy to parse and adapt the
protocol for accessing the database
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-opengauss`, an
openGauss implementation for ShardingSphere-Proxy to parse and adapt the
protocol for accessing the database
- `org.apache.shardingsphere:shardingsphere-proxy-backend`, the backend for
ShardingSphere Proxy
--
`org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper-curator`,
the zookeeper implementation of the persistent definition of cluster mode
configuration information
+-
`org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper`,
the zookeeper implementation of the persistent definition of cluster mode
configuration information
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-etcd`,
etcd implementation of persistent definition of cluster mode configuration
information
- `org.apache.shardingsphere:shardingsphere-jdbc-core`
diff --git a/examples/pom.xml b/examples/pom.xml
index 414b29e6425..0b4a6c6ae26 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -134,7 +134,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/pom.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/pom.xml
index a337c657072..cabce3f4cac 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
index ee8701a7c91..82329a986f8 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawJavaConfigurationExample.java
@@ -40,7 +40,7 @@ import java.sql.SQLException;
/*
* 1. Please make sure primary replica data replication sync on MySQL is
running correctly. Otherwise this example will query empty data from replica.
- * 2. Please make sure sharding-governance-center-zookeeper-curator in your
pom if registryCenterType = RegistryCenterType.ZOOKEEPER.
+ * 2. Please make sure sharding-governance-center-zookeeper in your pom if
registryCenterType = RegistryCenterType.ZOOKEEPER.
*/
public final class ClusterModeRawJavaConfigurationExample {
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawYamlConfigurationExample.java
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawYamlConfigurationExample.java
index 138fb363136..a6603802485 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawYamlConfigurationExample.java
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/cluster/mode/raw/jdbc/ClusterModeRawYamlConfigurationExample.java
@@ -32,7 +32,7 @@ import java.sql.SQLException;
/*
* 1. Please make sure primary replica data replication sync on MySQL is
running correctly. Otherwise this example will query empty data from replica.
- * 2. Please make sure sharding-governance-center-zookeeper-curator in your
pom if registryCenterType = RegistryCenterType.ZOOKEEPER.
+ * 2. Please make sure sharding-governance-center-zookeeper in your pom if
registryCenterType = RegistryCenterType.ZOOKEEPER.
* 3. Please make sure sharding-governance-center-nacos in your pom if
registryCenterType = RegistryCenterType.NACOS.
*/
public final class ClusterModeRawYamlConfigurationExample {
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/pom.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/pom.xml
index f39f35e44f2..d1b285fe48e 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
diff --git
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/pom.xml
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/pom.xml
index a041c04ea0e..4d26c18d0a7 100644
---
a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/kernel/data-pipeline/core/pom.xml
b/kernel/data-pipeline/core/pom.xml
index b85369a46d3..59cdcec4455 100644
--- a/kernel/data-pipeline/core/pom.xml
+++ b/kernel/data-pipeline/core/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/mode/type/cluster/repository/provider/pom.xml
b/mode/type/cluster/repository/provider/pom.xml
index 48af6598046..3216203f50f 100644
--- a/mode/type/cluster/repository/provider/pom.xml
+++ b/mode/type/cluster/repository/provider/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<modules>
- <module>zookeeper-curator</module>
+ <module>zookeeper</module>
<module>etcd</module>
<module>nacos</module>
<module>consul</module>
diff --git a/mode/type/cluster/repository/provider/zookeeper-curator/pom.xml
b/mode/type/cluster/repository/provider/zookeeper/pom.xml
similarity index 99%
rename from mode/type/cluster/repository/provider/zookeeper-curator/pom.xml
rename to mode/type/cluster/repository/provider/zookeeper/pom.xml
index 71481999119..669b1aa9086 100644
--- a/mode/type/cluster/repository/provider/zookeeper-curator/pom.xml
+++ b/mode/type/cluster/repository/provider/zookeeper/pom.xml
@@ -24,7 +24,7 @@
<artifactId>shardingsphere-cluster-mode-repository-provider</artifactId>
<version>5.2.2-SNAPSHOT</version>
</parent>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
similarity index 93%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
index 6716a7292d0..d16e36fac9b 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
@@ -37,7 +37,7 @@ import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEve
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
import
org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
-import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.CuratorZookeeperExceptionHandler;
+import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.ZookeeperExceptionHandler;
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.listener.SessionConnectionListener;
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperProperties;
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperPropertyKey;
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
/**
* Registry repository of ZooKeeper.
*/
-public final class CuratorZookeeperRepository implements
ClusterPersistRepository, InstanceContextAware {
+public final class ZookeeperRepository implements ClusterPersistRepository,
InstanceContextAware {
private final Map<String, CuratorCache> caches = new ConcurrentHashMap<>();
@@ -122,7 +122,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
throw new OperationTimeoutException();
}
} catch (final InterruptedException | OperationTimeoutException ex) {
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
@@ -135,7 +135,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
return Collections.emptyList();
}
}
@@ -151,7 +151,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
@@ -162,7 +162,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
@@ -173,7 +173,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
return null;
}
}
@@ -185,7 +185,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
return false;
}
}
@@ -200,7 +200,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
@@ -214,7 +214,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
if (ex instanceof NodeExistsException) {
throw new ClusterPersistRepositoryException(ex);
}
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
@@ -227,7 +227,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
@@ -256,7 +256,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/CuratorZookeeperExceptionHandler.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
similarity index 96%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/CuratorZookeeperExceptionHandler.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
index e4acede5eb7..f3a3b0746c1 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/CuratorZookeeperExceptionHandler.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
@@ -26,11 +26,11 @@ import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.KeeperException.NodeExistsException;
/**
- * Curator ZooKeeper exception handler.
+ * ZooKeeper exception handler.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
-public final class CuratorZookeeperExceptionHandler {
+public final class ZookeeperExceptionHandler {
/**
* Handle exception.
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
similarity index 96%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
index 464e52313e1..843bfe72868 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.metadata.persist.node.ComputeNode;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.CuratorZookeeperExceptionHandler;
+import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.ZookeeperExceptionHandler;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -70,7 +70,7 @@ public final class SessionConnectionListener implements
ConnectionStateListener
sleepInterval();
return false;
} catch (final InterruptedException ex) {
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
return true;
}
}
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZooKeeperDistributedLockCreator.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZooKeeperDistributedLockCreator.java
similarity index 85%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZooKeeperDistributedLockCreator.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZooKeeperDistributedLockCreator.java
index 194eb99d98a..ff14aa5e41e 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZooKeeperDistributedLockCreator.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZooKeeperDistributedLockCreator.java
@@ -23,13 +23,13 @@ import
org.apache.shardingsphere.mode.repository.cluster.lock.creator.Distribute
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperProperties;
/**
- * Curator zooKeeper distributed lock creator.
+ * ZooKeeper distributed lock creator.
*/
-public final class CuratorZooKeeperDistributedLockCreator implements
DistributedLockCreator<CuratorFramework, ZookeeperProperties> {
+public final class ZooKeeperDistributedLockCreator implements
DistributedLockCreator<CuratorFramework, ZookeeperProperties> {
@Override
public DistributedLock create(final String lockKey, final CuratorFramework
client, final ZookeeperProperties props) {
- return new CuratorZookeeperDistributedLock(lockKey, client);
+ return new ZookeeperDistributedLock(lockKey, client);
}
@Override
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLock.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLock.java
similarity index 82%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLock.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLock.java
index 346d5a0e9d0..8cc65005cc7 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLock.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLock.java
@@ -21,18 +21,18 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.locks.InterProcessLock;
import org.apache.curator.framework.recipes.locks.InterProcessMutex;
import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLock;
-import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.CuratorZookeeperExceptionHandler;
+import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.ZookeeperExceptionHandler;
import java.util.concurrent.TimeUnit;
/**
- * Curator ZooKeeper distributed lock.
+ * ZooKeeper distributed lock.
*/
-public final class CuratorZookeeperDistributedLock implements DistributedLock {
+public final class ZookeeperDistributedLock implements DistributedLock {
private final InterProcessLock lock;
- public CuratorZookeeperDistributedLock(final String lockKey, final
CuratorFramework client) {
+ public ZookeeperDistributedLock(final String lockKey, final
CuratorFramework client) {
lock = new InterProcessMutex(client, lockKey);
}
@@ -43,7 +43,7 @@ public final class CuratorZookeeperDistributedLock implements
DistributedLock {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
return false;
}
@@ -55,7 +55,7 @@ public final class CuratorZookeeperDistributedLock implements
DistributedLock {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
+ ZookeeperExceptionHandler.handleException(ex);
}
}
}
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperProperties.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperProperties.java
similarity index 100%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperProperties.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperProperties.java
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
similarity index 100%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertyKey.java
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
b/mode/type/cluster/repository/provider/zookeeper/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
similarity index 90%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
index ed036327b96..fb71823530f 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.repository.cluster.zookeeper.CuratorZookeeperRepository
+org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.lock.creator.DistributedLockCreator
b/mode/type/cluster/repository/provider/zookeeper/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.lock.creator.DistributedLockCreator
similarity index 95%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.lock.creator.DistributedLockCreator
rename to
mode/type/cluster/repository/provider/zookeeper/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.lock.creator.DistributedLockCreator
index f15989ce7d0..8cf882a6d31 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.lock.creator.DistributedLockCreator
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.lock.creator.DistributedLockCreator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.CuratorZooKeeperDistributedLockCreator
+org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.ZooKeeperDistributedLockCreator
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java
similarity index 96%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java
index 84b87844b73..fb1740fdd6b 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java
@@ -39,7 +39,7 @@ import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import
org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
-import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.CuratorZookeeperDistributedLock;
+import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.ZookeeperDistributedLock;
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperProperties;
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperPropertyKey;
import org.apache.zookeeper.CreateMode;
@@ -76,9 +76,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class CuratorZookeeperRepositoryTest {
+public final class ZookeeperRepositoryTest {
- private static final CuratorZookeeperRepository REPOSITORY = new
CuratorZookeeperRepository();
+ private static final ZookeeperRepository REPOSITORY = new
ZookeeperRepository();
private static final String SERVER_LISTS = "127.0.0.1:2181";
@@ -126,7 +126,7 @@ public final class CuratorZookeeperRepositoryTest {
@SneakyThrows({ReflectiveOperationException.class,
InterruptedException.class})
private void mockClient() {
- Field builderFiled =
CuratorZookeeperRepository.class.getDeclaredField("builder");
+ Field builderFiled =
ZookeeperRepository.class.getDeclaredField("builder");
builderFiled.setAccessible(true);
builderFiled.set(REPOSITORY, builder);
when(builder.connectString(anyString())).thenReturn(builder);
@@ -142,12 +142,12 @@ public final class CuratorZookeeperRepositoryTest {
@SneakyThrows(ReflectiveOperationException.class)
private void mockDistributedLockHolder() {
- Field distributedLockHolderField =
CuratorZookeeperRepository.class.getDeclaredField("distributedLockHolder");
+ Field distributedLockHolderField =
ZookeeperRepository.class.getDeclaredField("distributedLockHolder");
distributedLockHolderField.setAccessible(true);
DistributedLockHolder distributedLockHolder = new
DistributedLockHolder("Zookeeper", client, new ZookeeperProperties(new
Properties()));
Field locksFiled =
DistributedLockHolder.class.getDeclaredField("locks");
locksFiled.setAccessible(true);
- locksFiled.set(distributedLockHolder,
Collections.singletonMap("/locks/glock",
mock(CuratorZookeeperDistributedLock.class)));
+ locksFiled.set(distributedLockHolder,
Collections.singletonMap("/locks/glock", mock(ZookeeperDistributedLock.class)));
distributedLockHolderField.set(REPOSITORY, distributedLockHolder);
}
@@ -242,7 +242,7 @@ public final class CuratorZookeeperRepositoryTest {
@SneakyThrows(ReflectiveOperationException.class)
private void mockCache(final String key) {
- Field cachesFiled =
CuratorZookeeperRepository.class.getDeclaredField("caches");
+ Field cachesFiled =
ZookeeperRepository.class.getDeclaredField("caches");
cachesFiled.setAccessible(true);
Map<String, CuratorCache> caches = new HashMap<>();
caches.put(key, curatorCache);
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/CuratorZookeeperExceptionHandlerTest.java
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
similarity index 80%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/CuratorZookeeperExceptionHandlerTest.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
index 35b4e0074a6..2df07a31160 100644
---
a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/CuratorZookeeperExceptionHandlerTest.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
@@ -25,15 +25,15 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
-public final class CuratorZookeeperExceptionHandlerTest {
+public final class ZookeeperExceptionHandlerTest {
@Test
public void assertHandleException() {
- CuratorZookeeperExceptionHandler.handleException(null);
- CuratorZookeeperExceptionHandler.handleException(new
NoNodeException(""));
- CuratorZookeeperExceptionHandler.handleException(new Exception(new
NoNodeException("")));
+ ZookeeperExceptionHandler.handleException(null);
+ ZookeeperExceptionHandler.handleException(new NoNodeException(""));
+ ZookeeperExceptionHandler.handleException(new Exception(new
NoNodeException("")));
try {
- CuratorZookeeperExceptionHandler.handleException(new
Exception(""));
+ ZookeeperExceptionHandler.handleException(new Exception(""));
fail("must be failed handle new Exception().");
// CHECKSTYLE:OFF
} catch (final Exception ex) {
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertiesTest.java
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertiesTest.java
similarity index 100%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertiesTest.java
rename to
mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/props/ZookeeperPropertiesTest.java
diff --git
a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/resources/logback-test.xml
b/mode/type/cluster/repository/provider/zookeeper/src/test/resources/logback-test.xml
similarity index 100%
rename from
mode/type/cluster/repository/provider/zookeeper-curator/src/test/resources/logback-test.xml
rename to
mode/type/cluster/repository/provider/zookeeper/src/test/resources/logback-test.xml
diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml
index b0d31657cf4..ab496d42237 100644
--- a/proxy/bootstrap/pom.xml
+++ b/proxy/bootstrap/pom.xml
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
index aedd8916cab..39e49e0ee8e 100644
---
a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
+++
b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.integration.data.pipeline.framework.container.c
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeContainerComposer;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
-import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.CuratorZookeeperRepository;
+import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
@@ -57,7 +57,7 @@ public class ScalingWatcher extends TestWatcher {
String namespace = "it_db_" + databaseType.getType().toLowerCase();
ClusterPersistRepositoryConfiguration config = new
ClusterPersistRepositoryConfiguration("ZooKeeper", namespace,
dockerContainerComposer.getGovernanceContainer().getServerLists(), new
Properties());
- ClusterPersistRepository zookeeperRepository = new
CuratorZookeeperRepository();
+ ClusterPersistRepository zookeeperRepository = new
ZookeeperRepository();
zookeeperRepository.init(config, new
ProxyInstanceMetaData(UUID.randomUUID().toString(), 3307));
List<String> childrenKeys = zookeeperRepository.getChildrenKeys("/");
for (String each : childrenKeys) {
diff --git a/test/pipeline/pom.xml b/test/pipeline/pom.xml
index 565f2a80b14..a9617f71db8 100644
--- a/test/pipeline/pom.xml
+++ b/test/pipeline/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
+
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
