From 310e2ac33ca4df1592e4feebe549c6c5b3af517e Mon Sep 17 00:00:00 2001
From: kimmking <kimmking@163.com>
Date: Wed, 11 Mar 2020 12:17:28 +0800
Subject: [PATCH] modify for orchestration refactoring (#4705)

---
 .../ui/servcie/RegistryCenterService.java            |  2 +-
 .../ui/servcie/impl/RegistryCenterServiceImpl.java   |  2 +-
 .../ui/util/RegistryCenterRepositoryFactory.java     | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/RegistryCenterService.java b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/RegistryCenterService.java
index 4ed2d6302f..d69cfa345c 100644
--- a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/RegistryCenterService.java
+++ b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/RegistryCenterService.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.ui.servcie;
 
-import org.apache.shardingsphere.orchestration.center.api.RegistryCenterRepository;
+import org.apache.shardingsphere.orchestration.center.RegistryCenterRepository;
 import org.apache.shardingsphere.orchestration.internal.registry.config.node.ConfigurationNode;
 import org.apache.shardingsphere.orchestration.internal.registry.state.node.StateNode;
 
diff --git a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/RegistryCenterServiceImpl.java b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/RegistryCenterServiceImpl.java
index 8897587414..fb4b4d8d62 100644
--- a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/RegistryCenterServiceImpl.java
+++ b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/RegistryCenterServiceImpl.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.ui.servcie.impl;
 
-import org.apache.shardingsphere.orchestration.center.api.RegistryCenterRepository;
+import org.apache.shardingsphere.orchestration.center.RegistryCenterRepository;
 import org.apache.shardingsphere.orchestration.internal.registry.config.node.ConfigurationNode;
 import org.apache.shardingsphere.orchestration.internal.registry.state.node.StateNode;
 import org.apache.shardingsphere.ui.common.domain.RegistryCenterConfig;
diff --git a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/RegistryCenterRepositoryFactory.java b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/RegistryCenterRepositoryFactory.java
index 5bf1d02ebe..c4b69457da 100644
--- a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/RegistryCenterRepositoryFactory.java
+++ b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/util/RegistryCenterRepositoryFactory.java
@@ -20,11 +20,11 @@ package org.apache.shardingsphere.ui.util;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.orchestration.center.api.RegistryCenterRepository;
-import org.apache.shardingsphere.orchestration.center.configuration.InstanceConfiguration;
-import org.apache.shardingsphere.orchestration.center.instance.CuratorZookeeperInstance;
+import org.apache.shardingsphere.orchestration.center.RegistryCenterRepository;
+import org.apache.shardingsphere.orchestration.center.instance.CuratorZookeeperCenterRepository;
 import org.apache.shardingsphere.ui.common.constant.RegistryCenterType;
 import org.apache.shardingsphere.ui.common.domain.RegistryCenterConfig;
+import org.apache.shardingsphere.underlying.common.config.orchestration.CenterConfiguration;
 
 /**
  * Registry center factory.
@@ -48,7 +48,7 @@ public final class RegistryCenterRepositoryFactory {
         RegistryCenterType registryCenterType = RegistryCenterType.nameOf(config.getRegistryCenterType());
         switch (registryCenterType) {
             case ZOOKEEPER:
-                result = new CuratorZookeeperInstance();
+                result = new CuratorZookeeperCenterRepository();
                 break;
             default:
                 throw new UnsupportedOperationException(config.getName());
@@ -58,8 +58,8 @@ public final class RegistryCenterRepositoryFactory {
         return result;
     }
     
-    private static InstanceConfiguration convert(final RegistryCenterConfig config) {
-        InstanceConfiguration result = new InstanceConfiguration(config.getRegistryCenterType());
+    private static CenterConfiguration convert(final RegistryCenterConfig config) {
+        CenterConfiguration result = new CenterConfiguration(config.getRegistryCenterType());
         result.setServerLists(config.getServerLists());
         result.setNamespace(config.getNamespace());
         result.getProperties().put("digest", config.getDigest());
-- 
GitLab