[shardingsphere] branch master updated: Remove curator namespace (#6800)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan 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 b5bc2a9  Remove curator namespace (#6800)
b5bc2a9 is described below

commit b5bc2a959bac0800eda90fb8beb16945c3a7fa34
Author: Haoran Meng <menghaora...@gmail.com>
AuthorDate: Wed Aug 12 11:41:38 2020 +0800

    Remove curator namespace (#6800)
---
 .../repository/zookeeper/CuratorZookeeperRepository.java           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepository.java
 
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orch
 [...]
index 8bebc06..1720a4c 100644
--- 
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepository.java
+++ 
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepository.java
@@ -69,11 +69,11 @@ public final class CuratorZookeeperRepository implements 
ConfigurationRepository
     @Override
     public void init(final String name, final OrchestrationCenterConfiguration 
config) {
         ZookeeperProperties zookeeperProperties = new 
ZookeeperProperties(props);
-        client = buildCuratorClient(name, config, zookeeperProperties);
+        client = buildCuratorClient(config, zookeeperProperties);
         initCuratorClient(zookeeperProperties);
     }
     
-    private CuratorFramework buildCuratorClient(final String namespace, final 
OrchestrationCenterConfiguration config, final ZookeeperProperties 
zookeeperProperties) {
+    private CuratorFramework buildCuratorClient(final 
OrchestrationCenterConfiguration config, final ZookeeperProperties 
zookeeperProperties) {
         int retryIntervalMilliseconds = 
zookeeperProperties.getValue(ZookeeperPropertyKey.RETRY_INTERVAL_MILLISECONDS);
         int maxRetries = 
zookeeperProperties.getValue(ZookeeperPropertyKey.MAX_RETRIES);
         int timeToLiveSeconds = 
zookeeperProperties.getValue(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS);
@@ -81,8 +81,7 @@ public final class CuratorZookeeperRepository implements 
ConfigurationRepository
         String digest = 
zookeeperProperties.getValue(ZookeeperPropertyKey.DIGEST);
         CuratorFrameworkFactory.Builder builder = 
CuratorFrameworkFactory.builder()
             .connectString(config.getServerLists())
-            .retryPolicy(new 
ExponentialBackoffRetry(retryIntervalMilliseconds, maxRetries, 
retryIntervalMilliseconds * maxRetries))
-            .namespace(namespace);
+            .retryPolicy(new 
ExponentialBackoffRetry(retryIntervalMilliseconds, maxRetries, 
retryIntervalMilliseconds * maxRetries));
         if (0 != timeToLiveSeconds) {
             builder.sessionTimeoutMs(timeToLiveSeconds * 1000);
         }