You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/05/13 02:23:40 UTC
[shardingsphere] branch master updated: Rename
RegistryCenterRepository (#10322)
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 8f55bc1 Rename RegistryCenterRepository (#10322)
8f55bc1 is described below
commit 8f55bc1d78ace49a20196df1b75553e9cd6dbce7
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu May 13 10:23:01 2021 +0800
Rename RegistryCenterRepository (#10322)
* Rename RegistryCenterRepository
* Rename GovernanceRepositoryAPIImplTest
* Fix checkstyle
---
docs/document/content/dev-manual/governance.cn.md | 8 +-
docs/document/content/dev-manual/governance.en.md | 16 +-
.../listener/PrivilegeNodeChangedListener.java | 6 +-
.../authority/listener/UserChangedListener.java | 6 +-
.../PrivilegeNodeChangedListenerFactory.java | 6 +-
.../factory/UserChangedListenerFactory.java | 6 +-
.../listener/PrivilegeNodeChangedListenerTest.java | 4 +-
.../listener/UserChangedListenerTest.java | 4 +-
.../governance/core/facade/GovernanceFacade.java | 10 +-
...de.java => RegistryCenterRepositoryFacade.java} | 20 +-
.../core/registry/RegistryCacheManager.java | 4 +-
.../governance/core/registry/RegistryCenter.java | 10 +-
.../listener/GovernanceListenerFactory.java | 6 +-
.../listener/GovernanceListenerManager.java | 10 +-
.../PostGovernanceRepositoryEventListener.java | 6 +-
.../factory/DataSourceChangedListenerFactory.java | 6 +-
.../DataSourceStateChangedListenerFactory.java | 6 +-
.../factory/LockChangedListenerFactory.java | 6 +-
.../factory/MetaDataChangedListenerFactory.java | 6 +-
.../factory/PropertiesChangedListenerFactory.java | 6 +-
.../factory/RuleChangedListenerFactory.java | 6 +-
.../factory/SchemaChangedListenerFactory.java | 6 +-
.../TerminalStateChangedListenerFactory.java | 6 +-
.../listener/impl/DataSourceChangedListener.java | 6 +-
.../impl/DataSourceStateChangedListener.java | 6 +-
.../listener/impl/GlobalRuleChangedListener.java | 6 +-
.../listener/impl/LockChangedListener.java | 6 +-
.../listener/impl/MetaDataChangedListener.java | 6 +-
.../listener/impl/PropertiesChangedListener.java | 6 +-
.../listener/impl/RuleChangedListener.java | 6 +-
.../listener/impl/SchemaChangedListener.java | 6 +-
.../impl/TerminalStateChangedListener.java | 6 +-
.../core/facade/GovernanceFacadeTest.java | 4 +-
...y.java => TestAllRegistryCenterRepository.java} | 4 +-
...tory.java => TestRegistryCenterRepository.java} | 4 +-
.../core/registry/RegistryCenterTest.java | 270 ++++++++++-----------
...RegistryCenterRepositoryEventListenerTest.java} | 21 +-
.../impl/DataSourceChangedListenerTest.java | 2 +-
.../impl/DataSourceStateChangedListenerTest.java | 4 +-
.../impl/GlobalRuleChangedListenerTest.java | 6 +-
.../listener/impl/LockChangedListenerTest.java | 4 +-
.../listener/impl/MetaDataChangedListenerTest.java | 2 +-
.../listener/impl/MetaDataListenerTest.java | 4 +-
.../impl/PropertiesChangedListenerTest.java | 4 +-
.../listener/impl/RuleChangedListenerTest.java | 2 +-
.../listener/impl/SchemaChangedListenerTest.java | 2 +-
.../impl/TerminalStateChangedListenerTest.java | 4 +-
...rnance.repository.api.RegistryCenterRepository} | 4 +-
...pository.java => RegistryCenterRepository.java} | 4 +-
.../governance/repository/etcd/EtcdRepository.java | 4 +-
...rnance.repository.api.RegistryCenterRepository} | 0
.../zookeeper/CuratorZookeeperRepository.java | 4 +-
...rnance.repository.api.RegistryCenterRepository} | 0
...tory.java => TestRegistryCenterRepository.java} | 4 +-
...rnance.repository.api.RegistryCenterRepository} | 2 +-
...tory.java => TestRegistryCenterRepository.java} | 4 +-
.../GovernanceSpringBootRegistryEncryptTest.java | 4 +-
...ceSpringBootRegistryReadwriteSplittingTest.java | 4 +-
.../GovernanceSpringBootRegistryShardingTest.java | 4 +-
...rnance.repository.api.RegistryCenterRepository} | 2 +-
...tory.java => TestRegistryCenterRepository.java} | 4 +-
.../resources/META-INF/rdb/sharding-governance.xml | 20 +-
...rnance.repository.api.RegistryCenterRepository} | 2 +-
...y.java => FixtureRegistryCenterRepository.java} | 4 +-
.../impl/GovernanceBootstrapInitializerTest.java | 16 +-
...rnance.repository.api.RegistryCenterRepository} | 2 +-
.../scaling/core/api/ScalingAPIFactory.java | 10 +-
.../core/api/impl/GovernanceRepositoryAPIImpl.java | 4 +-
68 files changed, 331 insertions(+), 332 deletions(-)
diff --git a/docs/document/content/dev-manual/governance.cn.md b/docs/document/content/dev-manual/governance.cn.md
index 652196f..9a425fd 100644
--- a/docs/document/content/dev-manual/governance.cn.md
+++ b/docs/document/content/dev-manual/governance.cn.md
@@ -5,16 +5,16 @@ weight = 9
chapter = true
+++
-## GovernanceRepository
+## RegistryCenterRepository
| *SPI 名称* | *详细说明* |
| -------------------------------- | ----------------------- |
-| ConfigurationRepository | 配置中心 |
+| RegistryCenterRepository | 注册中心 |
| *已知实现类* | *详细说明* |
| -------------------------------- | ----------------------- |
-| CuratorZookeeperRepository | 基于 ZooKeeper 的配置中心 |
-| EtcdRepository | 基于 etcd 的配置中心 |
+| CuratorZookeeperRepository | 基于 ZooKeeper 的注册中心 |
+| EtcdRepository | 基于 etcd 的注册中心 |
## GovernanceListenerFactory
diff --git a/docs/document/content/dev-manual/governance.en.md b/docs/document/content/dev-manual/governance.en.md
index 89c745e..7b69c33 100644
--- a/docs/document/content/dev-manual/governance.en.md
+++ b/docs/document/content/dev-manual/governance.en.md
@@ -5,16 +5,16 @@ weight = 9
chapter = true
+++
-## GovernanceRepository
+## RegistryCenterRepository
-| *SPI Name* | *Description* |
-| -------------------------------- | --------------------------- |
-| ConfigurationRepository | Config repository |
+| *SPI Name* | *Description* |
+| -------------------------------- | ------------------------------------ |
+| RegistryCenterRepository | Registry center repository |
-| *Implementation Class* | *Description* |
-| -------------------------------- | --------------------------- |
-| CuratorZookeeperRepository | ZooKeeper config repository |
-| EtcdRepository | etcd config repository |
+| *Implementation Class* | *Description* |
+| -------------------------------- | ------------------------------------ |
+| CuratorZookeeperRepository | ZooKeeper registry center repository |
+| EtcdRepository | Etcd registry center repository |
## GovernanceListenerFactory
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListener.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListener.java
index 72264a5..35ebe00 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListener.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanceRepositoryEventListener;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import java.util.Collections;
@@ -33,8 +33,8 @@ import java.util.Optional;
*/
public final class PrivilegeNodeChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
- public PrivilegeNodeChangedListener(final GovernanceRepository governanceRepository) {
- super(governanceRepository, Collections.singletonList(new RegistryCenterNode().getPrivilegeNodePath()));
+ public PrivilegeNodeChangedListener(final RegistryCenterRepository registryCenterRepository) {
+ super(registryCenterRepository, Collections.singletonList(new RegistryCenterNode().getPrivilegeNodePath()));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListener.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListener.java
index 05fa25e..fa0b243 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListener.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanceRepositoryEventListener;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import java.util.Collections;
@@ -33,8 +33,8 @@ import java.util.Optional;
*/
public final class UserChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
- public UserChangedListener(final GovernanceRepository governanceRepository) {
- super(governanceRepository, Collections.singletonList(new RegistryCenterNode().getUsersNode()));
+ public UserChangedListener(final RegistryCenterRepository registryCenterRepository) {
+ super(registryCenterRepository, Collections.singletonList(new RegistryCenterNode().getUsersNode()));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/PrivilegeNodeChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/PrivilegeNodeChangedListenerFactory.java
index 57ebd3f..d7cd7b5 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/PrivilegeNodeChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/PrivilegeNodeChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.context.authority.listener.factory;
import org.apache.shardingsphere.governance.context.authority.listener.PrivilegeNodeChangedListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class PrivilegeNodeChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new PrivilegeNodeChangedListener(governanceRepository);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new PrivilegeNodeChangedListener(registryCenterRepository);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/UserChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/UserChangedListenerFactory.java
index 9e4daac..259ca2c 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/UserChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/factory/UserChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.context.authority.listener.factory;
import org.apache.shardingsphere.governance.context.authority.listener.UserChangedListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class UserChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new UserChangedListener(governanceRepository);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new UserChangedListener(registryCenterRepository);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListenerTest.java
index 56f7487..265a28a 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedListenerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.context.authority.listener;
import org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
@@ -39,7 +39,7 @@ public final class PrivilegeNodeChangedListenerTest {
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = new PrivilegeNodeChangedListener(mock(GovernanceRepository.class)).createEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = new PrivilegeNodeChangedListener(mock(RegistryCenterRepository.class)).createEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
Optional<ShardingSphereUser> user = ((AuthorityChangedEvent) actual.get()).getUsers().stream().filter(each -> each.getGrantee().equals(new Grantee("root1", ""))).findFirst();
assertTrue(user.isPresent());
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListenerTest.java
index 296272d..3176917 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/authority/listener/UserChangedListenerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.context.authority.listener;
import org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
@@ -39,7 +39,7 @@ public final class UserChangedListenerTest {
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = new UserChangedListener(mock(GovernanceRepository.class)).createEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = new UserChangedListener(mock(RegistryCenterRepository.class)).createEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
Optional<ShardingSphereUser> user = ((AuthorityChangedEvent) actual.get()).getUsers().stream().filter(each -> each.getGrantee().equals(new Grantee("root1", ""))).findFirst();
assertTrue(user.isPresent());
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
index eece24e..ee73c2a 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.facade;
import lombok.Getter;
-import org.apache.shardingsphere.governance.core.facade.repository.GovernanceRepositoryFacade;
+import org.apache.shardingsphere.governance.core.facade.repository.RegistryCenterRepositoryFacade;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerManager;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
@@ -39,7 +39,7 @@ public final class GovernanceFacade implements AutoCloseable {
private boolean isOverwrite;
- private GovernanceRepositoryFacade repositoryFacade;
+ private RegistryCenterRepositoryFacade repositoryFacade;
@Getter
private RegistryCenter registryCenter;
@@ -54,9 +54,9 @@ public final class GovernanceFacade implements AutoCloseable {
*/
public void init(final GovernanceConfiguration config, final Collection<String> schemaNames) {
isOverwrite = config.isOverwrite();
- repositoryFacade = new GovernanceRepositoryFacade(config);
- registryCenter = new RegistryCenter(repositoryFacade.getGovernanceRepository());
- listenerManager = new GovernanceListenerManager(repositoryFacade.getGovernanceRepository(), schemaNames.isEmpty()
+ repositoryFacade = new RegistryCenterRepositoryFacade(config);
+ registryCenter = new RegistryCenter(repositoryFacade.getRegistryCenterRepository());
+ listenerManager = new GovernanceListenerManager(repositoryFacade.getRegistryCenterRepository(), schemaNames.isEmpty()
? registryCenter.getAllSchemaNames() : Stream.of(registryCenter.getAllSchemaNames(), schemaNames).flatMap(Collection::stream).distinct().collect(Collectors.toList()));
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/repository/GovernanceRepositoryFacade.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/repository/RegistryCenterRepositoryFacade.java
similarity index 67%
rename from shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/repository/GovernanceRepositoryFacade.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/repository/RegistryCenterRepositoryFacade.java
index eb409f4..ae9d546 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/repository/GovernanceRepositoryFacade.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/repository/RegistryCenterRepositoryFacade.java
@@ -19,38 +19,38 @@ package org.apache.shardingsphere.governance.core.facade.repository;
import com.google.common.base.Preconditions;
import lombok.Getter;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
/**
- * Governance repository facade.
+ * Registry center repository facade.
*/
@Getter
-public final class GovernanceRepositoryFacade implements AutoCloseable {
+public final class RegistryCenterRepositoryFacade implements AutoCloseable {
static {
- ShardingSphereServiceLoader.register(GovernanceRepository.class);
+ ShardingSphereServiceLoader.register(RegistryCenterRepository.class);
}
- private final GovernanceRepository governanceRepository;
+ private final RegistryCenterRepository registryCenterRepository;
- public GovernanceRepositoryFacade(final GovernanceConfiguration config) {
- governanceRepository = createGovernanceRepository(config);
+ public RegistryCenterRepositoryFacade(final GovernanceConfiguration config) {
+ registryCenterRepository = createGovernanceRepository(config);
}
- private GovernanceRepository createGovernanceRepository(final GovernanceConfiguration config) {
+ private RegistryCenterRepository createGovernanceRepository(final GovernanceConfiguration config) {
GovernanceCenterConfiguration governanceCenterConfig = config.getGovernanceCenterConfiguration();
Preconditions.checkNotNull(governanceCenterConfig, "Governance center configuration cannot be null.");
- GovernanceRepository result = TypedSPIRegistry.getRegisteredService(GovernanceRepository.class, governanceCenterConfig.getType(), governanceCenterConfig.getProps());
+ RegistryCenterRepository result = TypedSPIRegistry.getRegisteredService(RegistryCenterRepository.class, governanceCenterConfig.getType(), governanceCenterConfig.getProps());
result.init(config.getName(), governanceCenterConfig);
return result;
}
@Override
public void close() {
- governanceRepository.close();
+ registryCenterRepository.close();
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCacheManager.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCacheManager.java
index 41e87e8..60379db 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCacheManager.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCacheManager.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry;
import com.google.common.base.Joiner;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import java.util.UUID;
@@ -31,7 +31,7 @@ public final class RegistryCacheManager {
private static final String PATH_SEPARATOR = "/";
- private final GovernanceRepository repository;
+ private final RegistryCenterRepository repository;
private final RegistryCenterNode node;
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
index 180cc4d..89b8f1d 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
@@ -42,7 +42,7 @@ import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationCo
import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfigurationWrap;
import org.apache.shardingsphere.governance.core.yaml.config.schema.YamlSchema;
import org.apache.shardingsphere.governance.core.yaml.swapper.SchemaYamlSwapper;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
@@ -87,7 +87,7 @@ public final class RegistryCenter {
private final RegistryCenterNode node;
- private final GovernanceRepository repository;
+ private final RegistryCenterRepository repository;
private final GovernanceInstance instance;
@@ -95,13 +95,13 @@ public final class RegistryCenter {
private final RegistryCacheManager registryCacheManager;
- public RegistryCenter(final GovernanceRepository governanceRepository) {
+ public RegistryCenter(final RegistryCenterRepository registryCenterRepository) {
node = new RegistryCenterNode();
- repository = governanceRepository;
+ repository = registryCenterRepository;
instance = GovernanceInstance.getInstance();
lockNode = new LockNode();
initLockNode();
- registryCacheManager = new RegistryCacheManager(governanceRepository, node);
+ registryCacheManager = new RegistryCacheManager(registryCenterRepository, node);
ShardingSphereEventBus.getInstance().register(this);
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerFactory.java
index 1c16034..79ea164 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerFactory.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -30,11 +30,11 @@ public interface GovernanceListenerFactory {
/**
* Create governance listener.
*
- * @param governanceRepository governance repository
+ * @param registryCenterRepository governance repository
* @param schemaNames schema names
* @return governance listener
*/
- GovernanceListener create(GovernanceRepository governanceRepository, Collection<String> schemaNames);
+ GovernanceListener create(RegistryCenterRepository registryCenterRepository, Collection<String> schemaNames);
/**
* Get watch types.
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerManager.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerManager.java
index 38781f4..1158845 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerManager.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GovernanceListenerManager.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
@@ -32,14 +32,14 @@ public final class GovernanceListenerManager {
ShardingSphereServiceLoader.register(GovernanceListenerFactory.class);
}
- private final GovernanceRepository governanceRepository;
+ private final RegistryCenterRepository registryCenterRepository;
private final Collection<String> schemaNames;
private final Collection<GovernanceListenerFactory> governanceListenerFactories;
- public GovernanceListenerManager(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- this.governanceRepository = governanceRepository;
+ public GovernanceListenerManager(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ this.registryCenterRepository = registryCenterRepository;
this.schemaNames = schemaNames;
governanceListenerFactories = ShardingSphereServiceLoader.getSingletonServiceInstances(GovernanceListenerFactory.class);
}
@@ -49,7 +49,7 @@ public final class GovernanceListenerManager {
*/
public void initListeners() {
for (GovernanceListenerFactory each : governanceListenerFactories) {
- each.create(governanceRepository, schemaNames).watch(each.getWatchTypes().toArray(new Type[0]));
+ each.create(registryCenterRepository, schemaNames).watch(each.getWatchTypes().toArray(new Type[0]));
}
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListener.java
index 1d56e9f..d5b478e 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListener.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
@@ -35,7 +35,7 @@ import java.util.Optional;
@RequiredArgsConstructor
public abstract class PostGovernanceRepositoryEventListener<T> implements GovernanceListener {
- private final GovernanceRepository governanceRepository;
+ private final RegistryCenterRepository registryCenterRepository;
private final Collection<String> watchKeys;
@@ -48,7 +48,7 @@ public abstract class PostGovernanceRepositoryEventListener<T> implements Govern
}
private void watch(final String watchKey, final Collection<Type> types) {
- governanceRepository.watch(watchKey, dataChangedEvent -> {
+ registryCenterRepository.watch(watchKey, dataChangedEvent -> {
if (types.contains(dataChangedEvent.getType())) {
Optional<T> event = createEvent(dataChangedEvent);
event.ifPresent(ShardingSphereEventBus.getInstance()::post);
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceChangedListenerFactory.java
index c0cf3d1..5d22f0f 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.DataSourceChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class DataSourceChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new DataSourceChangedListener(governanceRepository, schemaNames);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new DataSourceChangedListener(registryCenterRepository, schemaNames);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceStateChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceStateChangedListenerFactory.java
index 3a1fc44..b89ff91 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceStateChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceStateChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.DataSourceStateChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Arrays;
@@ -32,8 +32,8 @@ import java.util.Collection;
public final class DataSourceStateChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new DataSourceStateChangedListener(governanceRepository, schemaNames);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new DataSourceStateChangedListener(registryCenterRepository, schemaNames);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/LockChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/LockChangedListenerFactory.java
index 819b1e7..e35e2bd 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/LockChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/LockChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.LockChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Arrays;
@@ -32,8 +32,8 @@ import java.util.Collection;
public final class LockChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new LockChangedListener(governanceRepository);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new LockChangedListener(registryCenterRepository);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/MetaDataChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/MetaDataChangedListenerFactory.java
index f68c0df..8a577a2 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/MetaDataChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/MetaDataChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.MetaDataChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Arrays;
@@ -32,8 +32,8 @@ import java.util.Collection;
public final class MetaDataChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new MetaDataChangedListener(governanceRepository, schemaNames);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new MetaDataChangedListener(registryCenterRepository, schemaNames);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/PropertiesChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/PropertiesChangedListenerFactory.java
index 32cd750..c53c599 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/PropertiesChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/PropertiesChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.PropertiesChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class PropertiesChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new PropertiesChangedListener(governanceRepository);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new PropertiesChangedListener(registryCenterRepository);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/RuleChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/RuleChangedListenerFactory.java
index 9fda3da..4eef4f6 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/RuleChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/RuleChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.RuleChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class RuleChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new RuleChangedListener(governanceRepository, schemaNames);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new RuleChangedListener(registryCenterRepository, schemaNames);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/SchemaChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/SchemaChangedListenerFactory.java
index a2c4701..af4c208 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/SchemaChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/SchemaChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.SchemaChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class SchemaChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new SchemaChangedListener(governanceRepository, schemaNames);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new SchemaChangedListener(registryCenterRepository, schemaNames);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/TerminalStateChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/TerminalStateChangedListenerFactory.java
index 97af21a..ea880fb 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/TerminalStateChangedListenerFactory.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/TerminalStateChangedListenerFactory.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.factory;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListener;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerFactory;
import org.apache.shardingsphere.governance.core.registry.listener.impl.TerminalStateChangedListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import java.util.Collection;
@@ -32,8 +32,8 @@ import java.util.Collections;
public final class TerminalStateChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- return new TerminalStateChangedListener(governanceRepository);
+ public GovernanceListener create(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ return new TerminalStateChangedListener(registryCenterRepository);
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListener.java
index 1a94ae6..8d9827b 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListener.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanc
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.datasource.DataSourceChangedEvent;
import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfigurationWrap;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.infra.yaml.swapper.YamlDataSourceConfigurationSwapper;
@@ -43,8 +43,8 @@ public final class DataSourceChangedListener extends PostGovernanceRepositoryEve
private final RegistryCenterNode registryCenterNode;
- public DataSourceChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- super(governanceRepository, new RegistryCenterNode().getAllDataSourcePaths(schemaNames));
+ public DataSourceChangedListener(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ super(registryCenterRepository, new RegistryCenterNode().getAllDataSourcePaths(schemaNames));
registryCenterNode = new RegistryCenterNode();
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListener.java
index 12f7289..e77cd04 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListener.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanc
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.readwritesplitting.DisabledStateChangedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.readwritesplitting.PrimaryStateChangedEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -37,8 +37,8 @@ public final class DataSourceStateChangedListener extends PostGovernanceReposito
private final RegistryCenterNode registryCenterNode;
- public DataSourceStateChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- super(governanceRepository, new RegistryCenterNode().getAllSchemaPaths(schemaNames));
+ public DataSourceStateChangedListener(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ super(registryCenterRepository, new RegistryCenterNode().getAllSchemaPaths(schemaNames));
registryCenterNode = new RegistryCenterNode();
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListener.java
index c185982..22e08f6 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListener.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanc
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.GlobalRuleConfigurationsChangedEvent;
import org.apache.shardingsphere.governance.core.yaml.config.YamlRuleConfigurationWrap;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.YamlRuleConfiguration;
@@ -39,8 +39,8 @@ import java.util.Optional;
*/
public final class GlobalRuleChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
- public GlobalRuleChangedListener(final GovernanceRepository governanceRepository) {
- super(governanceRepository, Collections.singleton(new RegistryCenterNode().getGlobalRuleNode()));
+ public GlobalRuleChangedListener(final RegistryCenterRepository registryCenterRepository) {
+ super(registryCenterRepository, Collections.singleton(new RegistryCenterNode().getGlobalRuleNode()));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListener.java
index 1d9cbca..bd81b2a 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListener.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanc
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.lock.LockNotificationEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.lock.LockReleasedEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -36,8 +36,8 @@ public final class LockChangedListener extends PostGovernanceRepositoryEventList
private final LockNode lockNode;
- public LockChangedListener(final GovernanceRepository governanceRepository) {
- super(governanceRepository, Collections.singleton(new LockNode().getLockRootNodePath()));
+ public LockChangedListener(final RegistryCenterRepository registryCenterRepository) {
+ super(registryCenterRepository, Collections.singleton(new LockNode().getLockRootNodePath()));
lockNode = new LockNode();
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListener.java
index a688497..2494c09 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListener.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanc
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.metadata.MetaDataDeletedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.metadata.MetaDataPersistedEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import java.util.Collection;
@@ -42,8 +42,8 @@ public final class MetaDataChangedListener extends PostGovernanceRepositoryEvent
private final RegistryCenterNode registryCenterNode;
- public MetaDataChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- super(governanceRepository, Collections.singleton(new RegistryCenterNode().getMetadataNodePath()));
+ public MetaDataChangedListener(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ super(registryCenterRepository, Collections.singleton(new RegistryCenterNode().getMetadataNodePath()));
registryCenterNode = new RegistryCenterNode();
existedSchemaNames = new LinkedHashSet<>(schemaNames);
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListener.java
index 221aaa4..6bc4aea 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListener.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanceRepositoryEventListener;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.props.PropertiesChangedEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -34,8 +34,8 @@ import java.util.Properties;
*/
public final class PropertiesChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
- public PropertiesChangedListener(final GovernanceRepository governanceRepository) {
- super(governanceRepository, Collections.singletonList(new RegistryCenterNode().getPropsPath()));
+ public PropertiesChangedListener(final RegistryCenterRepository registryCenterRepository) {
+ super(registryCenterRepository, Collections.singletonList(new RegistryCenterNode().getPropsPath()));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListener.java
index 0f45a08..0412eb7 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListener.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.event.Governa
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.RuleConfigurationCachedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.RuleConfigurationsChangedEvent;
import org.apache.shardingsphere.governance.core.yaml.config.YamlRuleConfigurationWrap;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.YamlRuleConfiguration;
@@ -42,8 +42,8 @@ public final class RuleChangedListener extends PostGovernanceRepositoryEventList
private final RegistryCenterNode registryCenterNode;
- public RuleChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- super(governanceRepository, new RegistryCenterNode().getAllRulePaths(schemaNames));
+ public RuleChangedListener(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ super(registryCenterRepository, new RegistryCenterNode().getAllRulePaths(schemaNames));
registryCenterNode = new RegistryCenterNode();
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListener.java
index 9d9234d..e6a1c78 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListener.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.event.Governa
import org.apache.shardingsphere.governance.core.registry.listener.event.schema.SchemaChangedEvent;
import org.apache.shardingsphere.governance.core.yaml.config.schema.YamlSchema;
import org.apache.shardingsphere.governance.core.yaml.swapper.SchemaYamlSwapper;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -35,8 +35,8 @@ import java.util.Optional;
*/
public final class SchemaChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
- public SchemaChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
- super(governanceRepository, new RegistryCenterNode().getAllMetadataSchemaPaths(schemaNames));
+ public SchemaChangedListener(final RegistryCenterRepository registryCenterRepository, final Collection<String> schemaNames) {
+ super(registryCenterRepository, new RegistryCenterNode().getAllMetadataSchemaPaths(schemaNames));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListener.java
index 5af4ae2..830d228 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListener.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus;
import org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanceRepositoryEventListener;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.infra.state.StateEvent;
import org.apache.shardingsphere.infra.state.StateType;
@@ -34,8 +34,8 @@ import java.util.Optional;
*/
public final class TerminalStateChangedListener extends PostGovernanceRepositoryEventListener<StateEvent> {
- public TerminalStateChangedListener(final GovernanceRepository governanceRepository) {
- super(governanceRepository, Collections.singleton(new RegistryCenterNode().getProxyNodePath(GovernanceInstance.getInstance().getInstanceId())));
+ public TerminalStateChangedListener(final RegistryCenterRepository registryCenterRepository) {
+ super(registryCenterRepository, Collections.singleton(new RegistryCenterNode().getProxyNodePath(GovernanceInstance.getInstance().getInstanceId())));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
index 4c2a4f1..6443773 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.facade;
-import org.apache.shardingsphere.governance.core.facade.repository.GovernanceRepositoryFacade;
+import org.apache.shardingsphere.governance.core.facade.repository.RegistryCenterRepositoryFacade;
import org.apache.shardingsphere.governance.core.facade.util.FieldUtil;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
import org.apache.shardingsphere.governance.core.registry.listener.GovernanceListenerManager;
@@ -46,7 +46,7 @@ public final class GovernanceFacadeTest {
private final GovernanceFacade governanceFacade = new GovernanceFacade();
@Mock
- private GovernanceRepositoryFacade repositoryFacade;
+ private RegistryCenterRepositoryFacade repositoryFacade;
@Mock
private RegistryCenter registryCenter;
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllGovernanceRepository.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRegistryCenterRepository.java
similarity index 92%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllGovernanceRepository.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRegistryCenterRepository.java
index 8f89407..24b12e9 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllGovernanceRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRegistryCenterRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
-public final class TestAllGovernanceRepository implements GovernanceRepository {
+public final class TestAllRegistryCenterRepository implements RegistryCenterRepository {
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestGovernanceRepository.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryCenterRepository.java
similarity index 92%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestGovernanceRepository.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryCenterRepository.java
index 24a8641..8422dea 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestGovernanceRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryCenterRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
-public final class TestGovernanceRepository implements GovernanceRepository {
+public final class TestRegistryCenterRepository implements RegistryCenterRepository {
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
index 78bf92a..8c594e3 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.governance.core.registry.listener.event.rule.Sw
import org.apache.shardingsphere.governance.core.yaml.config.YamlRuleConfigurationWrap;
import org.apache.shardingsphere.governance.core.yaml.config.schema.YamlSchema;
import org.apache.shardingsphere.governance.core.yaml.swapper.SchemaYamlSwapper;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
@@ -111,7 +111,7 @@ public final class RegistryCenterTest {
private static final String META_DATA_YAML = "yaml/schema.yaml";
@Mock
- private GovernanceRepository governanceRepository;
+ private RegistryCenterRepository registryCenterRepository;
@Mock
private RegistryCacheManager registryCacheManager;
@@ -120,211 +120,211 @@ public final class RegistryCenterTest {
@Before
public void setUp() throws ReflectiveOperationException {
- registryCenter = new RegistryCenter(governanceRepository);
+ registryCenter = new RegistryCenter(registryCenterRepository);
Field field = registryCenter.getClass().getDeclaredField("repository");
field.setAccessible(true);
- field.set(registryCenter, governanceRepository);
+ field.set(registryCenter, registryCenterRepository);
}
@Test
public void assertPersistInstanceOnline() {
registryCenter.persistInstanceOnline();
- verify(governanceRepository).persistEphemeral(anyString(), anyString());
+ verify(registryCenterRepository).persistEphemeral(anyString(), anyString());
}
@Test
public void assertPersistDataSourcesNode() {
registryCenter.persistDataNodes();
- verify(governanceRepository).persist("/states/datanodes", "");
+ verify(registryCenterRepository).persist("/states/datanodes", "");
}
@Test
public void assertPersistInstanceData() {
registryCenter.persistInstanceData("test");
- verify(governanceRepository).persist(anyString(), eq("test"));
+ verify(registryCenterRepository).persist(anyString(), eq("test"));
}
@Test
public void assertLoadInstanceData() {
registryCenter.loadInstanceData();
- verify(governanceRepository).get(anyString());
+ verify(registryCenterRepository).get(anyString());
}
@Test
public void assertLoadDisabledDataSources() {
List<String> disabledDataSources = Collections.singletonList("replica_ds_0");
- when(governanceRepository.getChildrenKeys(anyString())).thenReturn(disabledDataSources);
+ when(registryCenterRepository.getChildrenKeys(anyString())).thenReturn(disabledDataSources);
registryCenter.loadDisabledDataSources("replica_query_db");
- verify(governanceRepository).getChildrenKeys(anyString());
- verify(governanceRepository).get(anyString());
+ verify(registryCenterRepository).getChildrenKeys(anyString());
+ verify(registryCenterRepository).get(anyString());
}
@Test
public void assertTryLock() {
registryCenter.tryLock("test", 50L);
- verify(governanceRepository).tryLock(eq(new LockNode().getLockNodePath("test")), eq(50L), eq(TimeUnit.MILLISECONDS));
+ verify(registryCenterRepository).tryLock(eq(new LockNode().getLockNodePath("test")), eq(50L), eq(TimeUnit.MILLISECONDS));
}
@Test
public void assertReleaseLock() {
registryCenter.releaseLock("test");
- verify(governanceRepository).releaseLock(eq(new LockNode().getLockNodePath("test")));
+ verify(registryCenterRepository).releaseLock(eq(new LockNode().getLockNodePath("test")));
}
@Test
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertMoreSchema() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(governanceRepository, times(0)).persist("/metadata", "myTest1,myTest2,sharding_db");
+ verify(registryCenterRepository, times(0)).persist("/metadata", "myTest1,myTest2,sharding_db");
}
@Test
public void assertMoreAndContainsSchema() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(governanceRepository, times(0)).persist("/metadata", "myTest1,sharding_db");
+ verify(registryCenterRepository, times(0)).persist("/metadata", "myTest1,sharding_db");
}
@Test
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForReplicaQueryRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReplicaQueryRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReadwriteSplittingWithoutAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForDatabaseDiscoveryRuleWithoutAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createDatabaseDiscoveryRuleConfiguration(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
}
@Test
public void assertPersistConfigurationForShardingRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForShardingRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForShardingRuleWithAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForReplicaQueryRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReadwriteSplittingRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReadwriteSplittingRuleWithAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForDatabaseDiscoveryRuleWithAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createDatabaseDiscoveryRuleConfiguration(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
}
@Test
public void assertPersistConfigurationForEncrypt() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createEncryptRuleConfiguration(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(ENCRYPT_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(ENCRYPT_RULE_YAML));
}
@Test
public void assertNullRuleConfiguration() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), Collections.emptyList(), true);
}
@Test
public void assertPersistConfigurationForShadow() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createShadowRuleConfiguration(), true);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHADOW_RULE_YAML));
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(registryCenterRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHADOW_RULE_YAML));
}
@Test
public void assertPersistGlobalConfiguration() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistGlobalConfiguration(createProperties(), true);
- verify(governanceRepository, times(0)).persist("/users", readYAML(USERS_YAML));
- verify(governanceRepository).persist("/props", PROPS_YAML);
+ verify(registryCenterRepository, times(0)).persist("/users", readYAML(USERS_YAML));
+ verify(registryCenterRepository).persist("/props", PROPS_YAML);
}
private Map<String, DataSourceConfiguration> createDataSourceConfigurations() {
@@ -380,8 +380,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDataSourceConfigurations() {
- when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAM));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAM));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Map<String, DataSourceConfiguration> actual = registryCenter.loadDataSourceConfigurations("sharding_db");
assertThat(actual.size(), is(2));
assertDataSourceConfiguration(actual.get("ds_0"), createDataSourceConfiguration(createDataSource("ds_0")));
@@ -397,16 +397,16 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDataSourceConfigurationsNotExistPath() {
- when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn("");
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/datasource")).thenReturn("");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Map<String, DataSourceConfiguration> actual = registryCenter.loadDataSourceConfigurations("sharding_db");
assertThat(actual.size(), is(0));
}
@Test
public void assertLoadShardingAndEncryptRuleConfiguration() {
- when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_AND_ENCRYPT_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_AND_ENCRYPT_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<RuleConfiguration> ruleConfigurations = registryCenter.loadRuleConfigurations("sharding_db");
assertThat(ruleConfigurations.size(), is(2));
for (RuleConfiguration each : ruleConfigurations) {
@@ -426,8 +426,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadShardingRuleConfiguration() {
- when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<RuleConfiguration> actual = registryCenter.loadRuleConfigurations("sharding_db");
assertThat(actual.size(), is(1));
ShardingRuleConfiguration actualShardingRuleConfig = (ShardingRuleConfiguration) actual.iterator().next();
@@ -437,8 +437,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadReadwriteSplittingRuleConfiguration() {
- when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(READWRITE_SPLITTING_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(READWRITE_SPLITTING_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<RuleConfiguration> actual = registryCenter.loadRuleConfigurations("sharding_db");
ReadwriteSplittingRuleConfiguration config = (ReadwriteSplittingRuleConfiguration) actual.iterator().next();
assertThat(config.getDataSources().size(), is(1));
@@ -448,8 +448,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDatabaseDiscoveryRuleConfiguration() {
- when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(DB_DISCOVERY_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(DB_DISCOVERY_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<RuleConfiguration> actual = registryCenter.loadRuleConfigurations("sharding_db");
DatabaseDiscoveryRuleConfiguration config = (DatabaseDiscoveryRuleConfiguration) actual.iterator().next();
assertThat(config.getDataSources().size(), is(1));
@@ -458,8 +458,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadEncryptRuleConfiguration() {
- when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(ENCRYPT_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(ENCRYPT_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
EncryptRuleConfiguration actual = (EncryptRuleConfiguration) registryCenter.loadRuleConfigurations("sharding_db").iterator().next();
assertThat(actual.getEncryptors().size(), is(1));
ShardingSphereAlgorithmConfiguration encryptAlgorithmConfig = actual.getEncryptors().get("order_encryptor");
@@ -469,8 +469,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadShadowRuleConfiguration() {
- when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHADOW_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHADOW_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
ShadowRuleConfiguration actual = (ShadowRuleConfiguration) registryCenter.loadRuleConfigurations("sharding_db").iterator().next();
assertThat(actual.getSourceDataSourceNames(), is(Arrays.asList("ds", "ds1")));
assertThat(actual.getShadowDataSourceNames(), is(Arrays.asList("shadow_ds", "shadow_ds1")));
@@ -479,8 +479,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadUsers() {
- when(governanceRepository.get("/users")).thenReturn(readYAML(USERS_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/users")).thenReturn(readYAML(USERS_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<ShardingSphereUser> actual = registryCenter.loadUsers();
Optional<ShardingSphereUser> user = actual.stream().filter(each -> each.getGrantee().equals(new Grantee("root1", ""))).findFirst();
assertTrue(user.isPresent());
@@ -489,16 +489,16 @@ public final class RegistryCenterTest {
@Test
public void assertLoadProperties() {
- when(governanceRepository.get("/props")).thenReturn(PROPS_YAML);
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/props")).thenReturn(PROPS_YAML);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Properties actual = registryCenter.loadProperties();
assertThat(actual.get(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(Boolean.FALSE));
}
@Test
public void assertLoadGlobalRuleConfigurations() {
- when(governanceRepository.get("/rule")).thenReturn(readYAML(GLOBAL_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/rule")).thenReturn(readYAML(GLOBAL_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<RuleConfiguration> globalRuleConfigs = registryCenter.loadGlobalRuleConfigurations();
assertFalse(globalRuleConfigs.isEmpty());
Collection<ShardingSphereUser> users = globalRuleConfigs.stream().filter(each -> each instanceof AuthorityRuleConfiguration)
@@ -516,8 +516,8 @@ public final class RegistryCenterTest {
@Test
public void assertGetAllSchemaNames() {
- when(governanceRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Collection<String> actual = registryCenter.getAllSchemaNames();
assertThat(actual.size(), is(2));
assertThat(actual, hasItems("sharding_db"));
@@ -526,8 +526,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDataSourceConfigurationsWithConnectionInitSqls() {
- when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAML_WITH_CONNECTION_INIT_SQL));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAML_WITH_CONNECTION_INIT_SQL));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Map<String, DataSourceConfiguration> actual = registryCenter.loadDataSourceConfigurations("sharding_db");
assertThat(actual.size(), is(2));
assertDataSourceConfigurationWithConnectionInitSqls(actual.get("ds_0"), createDataSourceConfiguration(createDataSourceWithConnectionInitSqls("ds_0")));
@@ -560,32 +560,32 @@ public final class RegistryCenterTest {
@Test
public void assertPersistSchemaNameWithExistSchema() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
- when(governanceRepository.get("/metadata")).thenReturn("sharding_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("sharding_db");
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(governanceRepository, times(0)).persist(eq("/metadata"), eq("sharding_db"));
+ verify(registryCenterRepository, times(0)).persist(eq("/metadata"), eq("sharding_db"));
}
@Test
public void assertPersistSchemaNameWithExistAndNewSchema() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
- when(governanceRepository.get("/metadata")).thenReturn("replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("replica_query_db");
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(governanceRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
+ verify(registryCenterRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
}
@Test
public void assertRenewDataSourceEvent() {
DataSourceAddedEvent event = new DataSourceAddedEvent("sharding_db", createDataSourceConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
+ verify(registryCenterRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
}
@Test
public void assertRenewDataSourceEventHasDataSourceConfig() {
DataSourceAddedEvent event = new DataSourceAddedEvent("sharding_db", createDataSourceConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
String dataSourceYaml = "dataSources:\n"
+ " ds_0:\n"
+ " dataSourceClassName: xxx\n"
@@ -598,73 +598,73 @@ public final class RegistryCenterTest {
+ " maxPoolSize: 50\n"
+ " minPoolSize: 1\n"
+ " maintenanceIntervalMilliseconds: 30000\n";
- when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn(dataSourceYaml);
+ when(registryCenterRepository.get("/metadata/sharding_db/datasource")).thenReturn(dataSourceYaml);
registryCenter.renew(event);
- verify(governanceRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
+ verify(registryCenterRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
}
@Test
public void assertRenewRuleEvent() {
RuleConfigurationsAlteredEvent event = new RuleConfigurationsAlteredEvent("sharding_db", createRuleConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository).persist(startsWith("/metadata/sharding_db/rule"), anyString());
+ verify(registryCenterRepository).persist(startsWith("/metadata/sharding_db/rule"), anyString());
}
@Test
public void assertRenewSchemaNameEventWithDrop() {
MetaDataDroppedEvent event = new MetaDataDroppedEvent("sharding_db");
- when(governanceRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository).persist(eq("/metadata"), eq("replica_query_db"));
+ verify(registryCenterRepository).persist(eq("/metadata"), eq("replica_query_db"));
}
@Test
public void assertRenewSchemaNameEventWithDropAndNotExist() {
MetaDataDroppedEvent event = new MetaDataDroppedEvent("sharding_db");
- when(governanceRepository.get("/metadata")).thenReturn("replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository, times(0)).persist(eq("/metadata"), eq("replica_query_db"));
+ verify(registryCenterRepository, times(0)).persist(eq("/metadata"), eq("replica_query_db"));
}
@Test
public void assertRenewSchemaNameEventWithAdd() {
MetaDataCreatedEvent event = new MetaDataCreatedEvent("sharding_db");
- when(governanceRepository.get("/metadata")).thenReturn("replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
+ verify(registryCenterRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
}
@Test
public void assertRenewSchemaNameEventWithAddAndExist() {
MetaDataCreatedEvent event = new MetaDataCreatedEvent("sharding_db");
- when(governanceRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository, times(0)).persist(eq("/metadata"), eq("sharding_db,replica_query_db"));
+ verify(registryCenterRepository, times(0)).persist(eq("/metadata"), eq("sharding_db,replica_query_db"));
}
@Test
public void assertPersistSchema() {
ShardingSphereSchema schema = new SchemaYamlSwapper().swapToObject(YamlEngine.unmarshal(readYAML(META_DATA_YAML), YamlSchema.class));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.persistSchema("sharding_db", schema);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
}
@Test
public void assertLoadSchema() {
- when(governanceRepository.get("/metadata/sharding_db/schema")).thenReturn(readYAML(META_DATA_YAML));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(registryCenterRepository.get("/metadata/sharding_db/schema")).thenReturn(readYAML(META_DATA_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Optional<ShardingSphereSchema> schemaOptional = registryCenter.loadSchema("sharding_db");
assertTrue(schemaOptional.isPresent());
Optional<ShardingSphereSchema> empty = registryCenter.loadSchema("test");
assertThat(empty, is(Optional.empty()));
ShardingSphereSchema schema = schemaOptional.get();
- verify(governanceRepository).get(eq("/metadata/sharding_db/schema"));
+ verify(registryCenterRepository).get(eq("/metadata/sharding_db/schema"));
assertThat(schema.getAllTableNames(), is(Collections.singleton("t_order")));
assertThat(schema.get("t_order").getIndexes().keySet(), is(Collections.singleton("primary")));
assertThat(schema.getAllColumnNames("t_order").size(), is(1));
@@ -674,44 +674,44 @@ public final class RegistryCenterTest {
@Test
public void assertRenewSchemaAlteredEvent() {
SchemaAlteredEvent event = new SchemaAlteredEvent("sharding_db", new SchemaYamlSwapper().swapToObject(YamlEngine.unmarshal(readYAML(META_DATA_YAML), YamlSchema.class)));
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
}
@Test
public void assertDeleteSchema() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.deleteSchema("sharding_db");
- verify(governanceRepository).delete(eq("/metadata/sharding_db"));
+ verify(registryCenterRepository).delete(eq("/metadata/sharding_db"));
}
@Test
@SneakyThrows
public void assertRenewSwitchRuleConfigurationEvent() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
Field field = RegistryCenter.class.getDeclaredField("registryCacheManager");
field.setAccessible(true);
field.set(registryCenter, registryCacheManager);
when(registryCacheManager.loadCache(anyString(), eq("testCacheId"))).thenReturn(readYAML(SHARDING_RULE_YAML));
SwitchRuleConfigurationEvent event = new SwitchRuleConfigurationEvent("sharding_db", "testCacheId");
registryCenter.renew(event);
- verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), anyString());
+ verify(registryCenterRepository).persist(eq("/metadata/sharding_db/rule"), anyString());
verify(registryCacheManager).deleteCache(eq("/metadata/sharding_db/rule"), eq("testCacheId"));
}
@Test
public void assertRenewDataSourceAlteredEvent() {
DataSourceAlteredEvent event = new DataSourceAlteredEvent("sharding_db", createDataSourceConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.renew(event);
- verify(governanceRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
+ verify(registryCenterRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
}
@Test
public void assertDeleteLockAck() {
- RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ RegistryCenter registryCenter = new RegistryCenter(registryCenterRepository);
registryCenter.deleteLockAck("test");
- verify(governanceRepository).delete(anyString());
+ verify(registryCenterRepository).delete(anyString());
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PostRegistryCenterRepositoryEventListenerTest.java
similarity index 81%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListenerTest.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PostRegistryCenterRepositoryEventListenerTest.java
index e409f3d..56c56a0 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PostGovernanceRepositoryEventListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/PostRegistryCenterRepositoryEventListenerTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -39,15 +39,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
-public final class PostGovernanceRepositoryEventListenerTest {
+public final class PostRegistryCenterRepositoryEventListenerTest {
@Mock
- private GovernanceRepository governanceRepository;
+ private RegistryCenterRepository repository;
@Test
public void assertWatch() {
- PostGovernanceRepositoryEventListener<GovernanceEvent> postEventListener = new PostGovernanceRepositoryEventListener<GovernanceEvent>(
- governanceRepository, Collections.singletonList("test")) {
+ PostGovernanceRepositoryEventListener<GovernanceEvent> postEventListener = new PostGovernanceRepositoryEventListener<GovernanceEvent>(repository, Collections.singletonList("test")) {
@Override
protected Optional<GovernanceEvent> createEvent(final DataChangedEvent event) {
@@ -58,14 +57,14 @@ public final class PostGovernanceRepositoryEventListenerTest {
DataChangedEventListener listener = (DataChangedEventListener) invocationOnMock.getArguments()[1];
listener.onChange(new DataChangedEvent("test", "value", Type.UPDATED));
return mock(DataChangedEventListener.class);
- }).when(governanceRepository).watch(anyString(), any(DataChangedEventListener.class));
+ }).when(repository).watch(anyString(), any(DataChangedEventListener.class));
postEventListener.watch(Type.UPDATED);
- verify(governanceRepository).watch(eq("test"), any());
+ verify(repository).watch(eq("test"), any());
}
@Test
public void assertWatchMultipleKey() {
- PostGovernanceRepositoryEventListener<GovernanceEvent> postEventListener = new PostGovernanceRepositoryEventListener<GovernanceEvent>(governanceRepository, Arrays.asList("test", "dev")) {
+ PostGovernanceRepositoryEventListener<GovernanceEvent> postEventListener = new PostGovernanceRepositoryEventListener<GovernanceEvent>(repository, Arrays.asList("test", "dev")) {
@Override
protected Optional<GovernanceEvent> createEvent(final DataChangedEvent event) {
@@ -76,9 +75,9 @@ public final class PostGovernanceRepositoryEventListenerTest {
DataChangedEventListener listener = (DataChangedEventListener) invocationOnMock.getArguments()[1];
listener.onChange(new DataChangedEvent("test", "value", Type.UPDATED));
return mock(DataChangedEventListener.class);
- }).when(governanceRepository).watch(anyString(), any(DataChangedEventListener.class));
+ }).when(repository).watch(anyString(), any(DataChangedEventListener.class));
postEventListener.watch(Type.UPDATED, Type.DELETED);
- verify(governanceRepository).watch(eq("test"), any());
- verify(governanceRepository).watch(eq("dev"), any());
+ verify(repository).watch(eq("test"), any());
+ verify(repository).watch(eq("dev"), any());
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListenerTest.java
index 8a298e6..bd6e315 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceChangedListenerTest.java
@@ -44,7 +44,7 @@ public final class DataSourceChangedListenerTest extends MetaDataListenerTest {
@Before
public void setUp() {
- dataSourceChangedListener = new DataSourceChangedListener(getGovernanceRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db", "encrypt_db"));
+ dataSourceChangedListener = new DataSourceChangedListener(getRegistryCenterRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db", "encrypt_db"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListenerTest.java
index ecdd1a7..1e5d3d6 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/DataSourceStateChangedListenerTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.readwritesplitting.DisabledStateChangedEvent;
import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Test;
@@ -37,7 +37,7 @@ public final class DataSourceStateChangedListenerTest {
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = new DataSourceStateChangedListener(mock(GovernanceRepository.class), Arrays.asList("sharding_db", "replica_query_db", "encrypt_db")).createEvent(
+ Optional<GovernanceEvent> actual = new DataSourceStateChangedListener(mock(RegistryCenterRepository.class), Arrays.asList("sharding_db", "replica_query_db", "encrypt_db")).createEvent(
new DataChangedEvent("/states/datanodes/replica_query_db/replica_ds_0", "disabled", Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((DisabledStateChangedEvent) actual.get()).getGovernanceSchema().getSchemaName(), is(new GovernanceSchema("replica_query_db", "replica_ds_0").getSchemaName()));
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListenerTest.java
index 6e972a5..c8e53ff 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/GlobalRuleChangedListenerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.GlobalRuleConfigurationsChangedEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Before;
@@ -37,11 +37,11 @@ public final class GlobalRuleChangedListenerTest extends MetaDataListenerTest {
private GlobalRuleChangedListener globalRuleChangedListener;
@Mock
- private GovernanceRepository governanceRepository;
+ private RegistryCenterRepository registryCenterRepository;
@Before
public void setUp() {
- globalRuleChangedListener = new GlobalRuleChangedListener(governanceRepository);
+ globalRuleChangedListener = new GlobalRuleChangedListener(registryCenterRepository);
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListenerTest.java
index 0c0aaf0..272f7b8 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/LockChangedListenerTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.junit.Test;
@@ -32,7 +32,7 @@ public final class LockChangedListenerTest {
@Test
public void assertCreateEventWithInvalidPath() {
- Optional<GovernanceEvent> actual = new LockChangedListener(mock(GovernanceRepository.class)).createEvent(new DataChangedEvent("/lock/glock", "", Type.ADDED));
+ Optional<GovernanceEvent> actual = new LockChangedListener(mock(RegistryCenterRepository.class)).createEvent(new DataChangedEvent("/lock/glock", "", Type.ADDED));
assertFalse(actual.isPresent());
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListenerTest.java
index 2235f9b..f7934da 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataChangedListenerTest.java
@@ -43,7 +43,7 @@ public final class MetaDataChangedListenerTest extends MetaDataListenerTest {
@Before
public void setUp() {
- metaDataChangedListener = new MetaDataChangedListener(getGovernanceRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db"));
+ metaDataChangedListener = new MetaDataChangedListener(getRegistryCenterRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataListenerTest.java
index 68aeb7d..24e1489 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/MetaDataListenerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.impl;
import lombok.Getter;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.mockito.Mock;
import java.io.IOException;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
public class MetaDataListenerTest {
@Mock
- private GovernanceRepository governanceRepository;
+ private RegistryCenterRepository registryCenterRepository;
@SneakyThrows({IOException.class, URISyntaxException.class})
protected String readYAML(final String yamlFile) {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListenerTest.java
index e066704..8be34fc 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/PropertiesChangedListenerTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.shardingsphere.governance.core.registry.listener.event.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.props.PropertiesChangedEvent;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
@@ -38,7 +38,7 @@ public final class PropertiesChangedListenerTest {
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = new PropertiesChangedListener(mock(GovernanceRepository.class)).createEvent(new DataChangedEvent("test", PROPERTIES_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = new PropertiesChangedListener(mock(RegistryCenterRepository.class)).createEvent(new DataChangedEvent("test", PROPERTIES_YAML, Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((PropertiesChangedEvent) actual.get()).getProps().get(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(true));
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListenerTest.java
index c10a81e..992daa8 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/RuleChangedListenerTest.java
@@ -54,7 +54,7 @@ public final class RuleChangedListenerTest extends MetaDataListenerTest {
@Before
public void setUp() {
- ruleChangedListener = new RuleChangedListener(getGovernanceRepository(), Arrays.asList("sharding_db", "replica_query_db", "encrypt_db"));
+ ruleChangedListener = new RuleChangedListener(getRegistryCenterRepository(), Arrays.asList("sharding_db", "replica_query_db", "encrypt_db"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListenerTest.java
index 4ef6dda..3d84a1ea 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/SchemaChangedListenerTest.java
@@ -42,7 +42,7 @@ public final class SchemaChangedListenerTest extends MetaDataListenerTest {
@Before
public void setUp() {
- schemaChangedListener = new SchemaChangedListener(getGovernanceRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db", "encrypt_db"));
+ schemaChangedListener = new SchemaChangedListener(getRegistryCenterRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db", "encrypt_db"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListenerTest.java
index 4af46e5..888baae 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/impl/TerminalStateChangedListenerTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.infra.state.StateEvent;
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.mock;
public final class TerminalStateChangedListenerTest {
- private final TerminalStateChangedListener terminalStateChangedListener = new TerminalStateChangedListener(mock(GovernanceRepository.class));
+ private final TerminalStateChangedListener terminalStateChangedListener = new TerminalStateChangedListener(mock(RegistryCenterRepository.class));
@Test
public void assertCreateEventWhenEnabled() {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
similarity index 88%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
index 1856055..d51af80 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.governance.core.facade.fixture.TestGovernanceRepository
-org.apache.shardingsphere.governance.core.facade.fixture.TestAllGovernanceRepository
+org.apache.shardingsphere.governance.core.facade.fixture.TestRegistryCenterRepository
+org.apache.shardingsphere.governance.core.facade.fixture.TestAllRegistryCenterRepository
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/GovernanceRepository.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/RegistryCenterRepository.java
similarity index 96%
rename from shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/GovernanceRepository.java
rename to shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/RegistryCenterRepository.java
index ecb41fe..cf6710c 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/GovernanceRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/RegistryCenterRepository.java
@@ -25,9 +25,9 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
/**
- * Governance repository.
+ * Registry center repository.
*/
-public interface GovernanceRepository extends TypedSPI {
+public interface RegistryCenterRepository extends TypedSPI {
/**
* Path separator.
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java
index 6076a48..f670ede 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/java/org/apache/shardingsphere/governance/repository/etcd/EtcdRepository.java
@@ -30,7 +30,7 @@ import io.etcd.jetcd.watch.WatchEvent;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
/**
* Governance repository of ETCD.
*/
-public final class EtcdRepository implements GovernanceRepository {
+public final class EtcdRepository implements RegistryCenterRepository {
private Client client;
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/resources/META-INF/services/org.apache.shardingsphere.gov [...]
similarity index 100%
rename from shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/governance/repository/zookeeper/CuratorZookeeperRepository.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/govern [...]
index e6fb22d..c3f414a 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/governance/repository/zookeeper/CuratorZookeeperRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/governance/repository/zookeeper/CuratorZookeeperRepository.java
@@ -30,7 +30,7 @@ import org.apache.curator.framework.recipes.locks.InterProcessLock;
import org.apache.curator.framework.recipes.locks.InterProcessMutex;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.utils.CloseableUtils;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -57,7 +57,7 @@ import java.util.concurrent.TimeUnit;
/**
* Governance repository of ZooKeeper.
*/
-public final class CuratorZookeeperRepository implements GovernanceRepository {
+public final class CuratorZookeeperRepository implements RegistryCenterRepository {
private final Map<String, CuratorCache> caches = new HashMap<>();
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/resources/META-INF/services/org [...]
similarity index 100%
rename from shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestGovernanceRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryCenterRepository.java
similarity index 93%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestGovernanceRepository.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryCenterRepository.java
index 1c55a89..5c9411f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestGovernanceRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryCenterRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.governance.fixture;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-public final class TestGovernanceRepository implements GovernanceRepository {
+public final class TestRegistryCenterRepository implements RegistryCenterRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
similarity index 90%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
index f685925..5a4315e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.governance.fixture.TestGovernanceRepository
+org.apache.shardingsphere.driver.governance.fixture.TestRegistryCenterRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestRegistryCenterRepository.java
similarity index 93%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestRegistryCenterRepository.java
index 1cb458e..7d70a51 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestRegistryCenterRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.boot.governance.registry;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-public final class TestGovernanceRepository implements GovernanceRepository {
+public final class TestRegistryCenterRepository implements RegistryCenterRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegis [...]
index 281d06f..aae5bb3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
-import org.apache.shardingsphere.spring.boot.governance.registry.TestGovernanceRepository;
+import org.apache.shardingsphere.spring.boot.governance.registry.TestRegistryCenterRepository;
import org.apache.shardingsphere.spring.boot.governance.util.EmbedTestingServer;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -66,7 +66,7 @@ public class GovernanceSpringBootRegistryEncryptTest {
EmbedTestingServer.start();
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
- TestGovernanceRepository repository = new TestGovernanceRepository();
+ TestRegistryCenterRepository repository = new TestRegistryCenterRepository();
repository.persist("/metadata/logic_db/datasource", dataSource);
repository.persist("/metadata/logic_db/rule", encryptRule);
repository.persist("/props", ConfigurationPropertyKey.SQL_SHOW.getKey() + ": 'true'\n");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryReadwriteSplittingTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpri [...]
index fe944aa..31fdb97 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryReadwriteSplittingTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryReadwriteSplittingTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.driver.governance.internal.datasource.GovernanceShardingSphereDataSource;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
-import org.apache.shardingsphere.spring.boot.governance.registry.TestGovernanceRepository;
+import org.apache.shardingsphere.spring.boot.governance.registry.TestRegistryCenterRepository;
import org.apache.shardingsphere.spring.boot.governance.util.EmbedTestingServer;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -60,7 +60,7 @@ public class GovernanceSpringBootRegistryReadwriteSplittingTest {
@BeforeClass
public static void init() {
EmbedTestingServer.start();
- TestGovernanceRepository repository = new TestGovernanceRepository();
+ TestRegistryCenterRepository repository = new TestRegistryCenterRepository();
repository.persist("/metadata/logic_db/datasource", readYAML(DATA_SOURCE_FILE));
repository.persist("/metadata/logic_db/rule", readYAML(RULE_FILE));
repository.persist("/props", "{}\n");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryShardingTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegi [...]
index ef44ab0..2400a76 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryShardingTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryShardingTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.TableRule;
-import org.apache.shardingsphere.spring.boot.governance.registry.TestGovernanceRepository;
+import org.apache.shardingsphere.spring.boot.governance.registry.TestRegistryCenterRepository;
import org.apache.shardingsphere.spring.boot.governance.util.EmbedTestingServer;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -66,7 +66,7 @@ public class GovernanceSpringBootRegistryShardingTest {
EmbedTestingServer.start();
String shardingDatabases = readYAML(SHARDING_DATABASES_FILE);
String shardingRule = readYAML(SHARDING_RULE_FILE);
- TestGovernanceRepository repository = new TestGovernanceRepository();
+ TestRegistryCenterRepository repository = new TestRegistryCenterRepository();
repository.persist("/metadata/logic_db/datasource", shardingDatabases);
repository.persist("/metadata/logic_db/rule", shardingRule);
repository.persist("/props", ConfigurationPropertyKey.EXECUTOR_SIZE.getKey() + ": '100'\n" + ConfigurationPropertyKey.SQL_SHOW.getKey() + ": 'true'\n");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.Registr [...]
similarity index 90%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
index 65161fc..c17dacd 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.spring.boot.governance.registry.TestGovernanceRepository
+org.apache.shardingsphere.spring.boot.governance.registry.TestRegistryCenterRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestRegistryCenterRepository.java
similarity index 92%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestRegistryCenterRepository.java
index e40a7e0..fdb1c7f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestRegistryCenterRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.namespace.governance.registry;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
-public final class TestGovernanceRepository implements GovernanceRepository {
+public final class TestRegistryCenterRepository implements RegistryCenterRepository {
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-governance.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-governance.xml
index c35df52..7b276d3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-governance.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-governance.xml
@@ -34,22 +34,22 @@
<prop key="operation-timeout-milliseconds">1000</prop>
</util:properties>
- <governance:reg-center id="governanceRepository" type="TestRegistry" server-lists="localhost:3181">
+ <governance:reg-center id="registryCenterRepository" type="TestRegistry" server-lists="localhost:3181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
</props>
</governance:reg-center>
- <governance:data-source id="simpleShardingGovernance" data-source-names="dbtbl_0" rule-refs="simpleShardingDataSourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="shardingRuleWithAttributesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="shardingRuleWithAttributesDataSourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="multiTableRulesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiTableRulesDataSourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="tableRuleWithAttributesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="tableRuleWithAttributesDataSourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="bindingTableRuleDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="bindingTableRuleDatasourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="multiBindingTableRulesDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiBindingTableRulesDatasourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="broadcastTableRuleDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="broadcastTableRuleDatasourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="multiBroadcastTableRulesDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiBroadcastTableRulesDatasourceShardingRule" reg-center-ref="governanceRepository" />
- <governance:data-source id="propsDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="propsDataSourceShardingRule" reg-center-ref="governanceRepository">
+ <governance:data-source id="simpleShardingGovernance" data-source-names="dbtbl_0" rule-refs="simpleShardingDataSourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="shardingRuleWithAttributesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="shardingRuleWithAttributesDataSourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="multiTableRulesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiTableRulesDataSourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="tableRuleWithAttributesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="tableRuleWithAttributesDataSourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="bindingTableRuleDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="bindingTableRuleDatasourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="multiBindingTableRulesDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiBindingTableRulesDatasourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="broadcastTableRuleDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="broadcastTableRuleDatasourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="multiBroadcastTableRulesDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiBroadcastTableRulesDatasourceShardingRule" reg-center-ref="registryCenterRepository" />
+ <governance:data-source id="propsDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="propsDataSourceShardingRule" reg-center-ref="registryCenterRepository">
<props>
<prop key="sql-show">${sql_show}</prop>
<prop key="executor-size">10</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCente [...]
similarity index 96%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
index f4f4765..42d8b29 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.spring.namespace.governance.registry.TestGovernanceRepository
+org.apache.shardingsphere.spring.namespace.governance.registry.TestRegistryCenterRepository
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureGovernanceRepository.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryCenterRepository.java
similarity index 93%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureGovernanceRepository.java
rename to shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryCenterRepository.java
index 79e72e8..86d037b 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureGovernanceRepository.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryCenterRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.fixture;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-public final class FixtureGovernanceRepository implements GovernanceRepository {
+public final class FixtureRegistryCenterRepository implements RegistryCenterRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
index f67b61f..0403b0c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.ProxyConfigurationLoader;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
-import org.apache.shardingsphere.proxy.fixture.FixtureGovernanceRepository;
+import org.apache.shardingsphere.proxy.fixture.FixtureRegistryCenterRepository;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration;
@@ -71,7 +71,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
private static final String PROPS_YAML = "conf/reg_center/props.yaml";
- private final FixtureGovernanceRepository governanceRepository = new FixtureGovernanceRepository();
+ private final FixtureRegistryCenterRepository registryCenterRepository = new FixtureRegistryCenterRepository();
@Test
public void assertGetProxyConfiguration() throws IOException {
@@ -83,11 +83,11 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
private void initConfigCenter() {
RegistryCenterNode node = new RegistryCenterNode();
- governanceRepository.persist(node.getUsersNode(), readYAML(USERS_YAML));
- governanceRepository.persist(node.getPropsPath(), readYAML(PROPS_YAML));
- governanceRepository.persist(node.getMetadataNodePath(), "db");
- governanceRepository.persist(node.getMetadataDataSourcePath("db"), readYAML(DATA_SOURCE_YAML));
- governanceRepository.persist(node.getRulePath("db"), readYAML(SHARDING_RULE_YAML));
+ registryCenterRepository.persist(node.getUsersNode(), readYAML(USERS_YAML));
+ registryCenterRepository.persist(node.getPropsPath(), readYAML(PROPS_YAML));
+ registryCenterRepository.persist(node.getMetadataNodePath(), "db");
+ registryCenterRepository.persist(node.getMetadataDataSourcePath("db"), readYAML(DATA_SOURCE_YAML));
+ registryCenterRepository.persist(node.getRulePath("db"), readYAML(SHARDING_RULE_YAML));
}
@SneakyThrows({URISyntaxException.class, IOException.class})
@@ -96,7 +96,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
}
private void closeConfigCenter() {
- governanceRepository.close();
+ registryCenterRepository.close();
}
@Test
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
similarity index 91%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
rename to shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
index f76944f..3e21fd8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.fixture.FixtureGovernanceRepository
+org.apache.shardingsphere.proxy.fixture.FixtureRegistryCenterRepository
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java
index 4a9f410..83c5338 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingAPIFactory.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobStatisticsAPI;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
@@ -130,7 +130,7 @@ public final class ScalingAPIFactory {
private static volatile GovernanceRepositoryAPI instance;
static {
- ShardingSphereServiceLoader.register(GovernanceRepository.class);
+ ShardingSphereServiceLoader.register(RegistryCenterRepository.class);
}
public static GovernanceRepositoryAPI getInstance() {
@@ -148,9 +148,9 @@ public final class ScalingAPIFactory {
checkServerConfig();
GovernanceConfiguration governanceConfig = ScalingContext.getInstance().getServerConfig().getGovernanceConfig();
GovernanceCenterConfiguration registryCenterConfig = governanceConfig.getGovernanceCenterConfiguration();
- GovernanceRepository governanceRepository = TypedSPIRegistry.getRegisteredService(GovernanceRepository.class, registryCenterConfig.getType(), registryCenterConfig.getProps());
- governanceRepository.init(governanceConfig.getName(), registryCenterConfig);
- return new GovernanceRepositoryAPIImpl(governanceRepository);
+ RegistryCenterRepository registryCenterRepository = TypedSPIRegistry.getRegisteredService(RegistryCenterRepository.class, registryCenterConfig.getType(), registryCenterConfig.getProps());
+ registryCenterRepository.init(governanceConfig.getName(), registryCenterConfig);
+ return new GovernanceRepositoryAPIImpl(registryCenterRepository);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java
index df0d7e9..ce24a95 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.api.impl;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
+import org.apache.shardingsphere.governance.repository.api.RegistryCenterRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
@@ -42,7 +42,7 @@ import java.util.Map;
@Slf4j
public final class GovernanceRepositoryAPIImpl implements GovernanceRepositoryAPI {
- private final GovernanceRepository repository;
+ private final RegistryCenterRepository repository;
@Override
public void persistJobProgress(final JobContext jobContext) {