You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/05/12 13:46:39 UTC
[shardingsphere] branch master updated: Merge RegistryRepository
and GovernanceRepository (#10320)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 332e8fc Merge RegistryRepository and GovernanceRepository (#10320)
332e8fc is described below
commit 332e8fcea1a5e1f8b57430772c2d3732fd3da277
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed May 12 21:45:36 2021 +0800
Merge RegistryRepository and GovernanceRepository (#10320)
* Merge RegistryRepository and GovernanceRepository
* Update docs
* Remove useless codes
* Update javadoc
---
docs/document/content/dev-manual/governance.cn.md | 13 +-
docs/document/content/dev-manual/governance.en.md | 13 +-
.../listener/PrivilegeNodeChangedListener.java | 8 +-
.../authority/listener/UserChangedListener.java | 8 +-
.../PrivilegeNodeChangedListenerFactory.java | 6 +-
.../factory/UserChangedListenerFactory.java | 6 +-
.../listener/PrivilegeNodeChangedListenerTest.java | 17 +-
.../listener/UserChangedListenerTest.java | 20 +-
.../governance/core/facade/GovernanceFacade.java | 4 +-
.../repository/GovernanceRepositoryFacade.java | 24 +-
.../core/registry/RegistryCacheManager.java | 11 +-
.../governance/core/registry/RegistryCenter.java | 22 +-
.../listener/GovernanceListenerFactory.java | 6 +-
.../listener/GovernanceListenerManager.java | 10 +-
.../factory/DataSourceChangedListenerFactory.java | 10 +-
.../DataSourceStateChangedListenerFactory.java | 6 +-
.../factory/LockChangedListenerFactory.java | 6 +-
.../factory/MetaDataChangedListenerFactory.java | 6 +-
.../factory/PropertiesChangedListenerFactory.java | 6 +-
.../factory/RuleChangedListenerFactory.java | 10 +-
.../factory/SchemaChangedListenerFactory.java | 10 +-
.../TerminalStateChangedListenerFactory.java | 6 +-
.../listener/impl/DataSourceChangedListener.java | 8 +-
.../impl/DataSourceStateChangedListener.java | 10 +-
.../listener/impl/GlobalRuleChangedListener.java | 6 +-
.../listener/impl/LockChangedListener.java | 8 +-
.../listener/impl/MetaDataChangedListener.java | 8 +-
.../listener/impl/PropertiesChangedListener.java | 8 +-
.../listener/impl/RuleChangedListener.java | 8 +-
.../listener/impl/SchemaChangedListener.java | 8 +-
.../impl/TerminalStateChangedListener.java | 8 +-
.../GovernanceConfigurationYamlSwapper.java | 2 +-
...itory.java => TestAllGovernanceRepository.java} | 15 +-
...pository.java => TestGovernanceRepository.java} | 14 +-
.../core/registry/RegistryCenterTest.java | 277 +++++++++++----------
.../impl/DataSourceChangedListenerTest.java | 2 +-
.../impl/DataSourceStateChangedListenerTest.java | 20 +-
.../impl/GlobalRuleChangedListenerTest.java | 6 +-
.../listener/impl/LockChangedListenerTest.java | 20 +-
.../listener/impl/MetaDataChangedListenerTest.java | 2 +-
.../listener/impl/MetaDataListenerTest.java | 4 +-
.../impl/PropertiesChangedListenerTest.java | 20 +-
.../listener/impl/RuleChangedListenerTest.java | 2 +-
.../listener/impl/SchemaChangedListenerTest.java | 2 +-
.../impl/TerminalStateChangedListenerTest.java | 18 +-
.../GovernanceConfigurationYamlSwapperTest.java | 24 +-
...governance.repository.api.GovernanceRepository} | 4 +-
.../repository/api/GovernanceRepository.java | 37 ++-
.../repository/api/RegistryRepository.java | 51 ----
.../api/config/GovernanceConfiguration.java | 2 +-
.../governance/repository/etcd/EtcdRepository.java | 6 +-
...governance.repository.api.GovernanceRepository} | 0
.../zookeeper/CuratorZookeeperRepository.java | 4 +-
...governance.repository.api.GovernanceRepository} | 0
...ernanceShardingSphereDataSourceFactoryTest.java | 2 +-
...pository.java => TestGovernanceRepository.java} | 16 +-
.../GovernanceShardingSphereDataSourceTest.java | 2 +-
.../YamlInstanceConfigurationSwapperUtilTest.java | 2 +-
...governance.repository.api.GovernanceRepository} | 2 +-
...gWithReadwriteSplittingDataSourceWithProps.yaml | 2 +-
...thReadwriteSplittingDataSourceWithoutProps.yaml | 2 +-
.../sharding/configWithDataSourceWithProps.yaml | 2 +-
.../sharding/configWithDataSourceWithoutProps.yaml | 2 +-
.../sharding/configWithoutDataSourceWithProps.yaml | 2 +-
.../configWithoutDataSourceWithoutProps.yaml | 2 +-
.../configWithDataSourceWithProps.yaml | 2 +-
.../configWithDataSourceWithoutProps.yaml | 2 +-
.../configWithDataSourceWithoutRules.yaml | 2 +-
.../configWithoutDataSourceWithProps.yaml | 2 +-
.../configWithoutDataSourceWithoutProps.yaml | 2 +-
.../src/test/resources/yaml/unit/sharding.yaml | 2 +-
.../registry/TestGovernanceRepository.java | 4 +-
...governance.repository.api.GovernanceRepository} | 0
.../registry/TestGovernanceRepository.java | 4 +-
.../resources/META-INF/rdb/sharding-governance.xml | 20 +-
...governance.repository.api.GovernanceRepository} | 0
...itory.java => FixtureGovernanceRepository.java} | 16 +-
.../impl/GovernanceBootstrapInitializerTest.java | 16 +-
...governance.repository.api.GovernanceRepository} | 2 +-
.../src/test/resources/conf/local/server.yaml | 2 +-
.../src/test/resources/conf/reg_center/server.yaml | 2 +-
...sitoryAPI.java => GovernanceRepositoryAPI.java} | 4 +-
.../scaling/core/api/ScalingAPIFactory.java | 42 ++--
...IImpl.java => GovernanceRepositoryAPIImpl.java} | 24 +-
.../scaling/core/api/impl/ScalingAPIImpl.java | 10 +-
.../core/executor/job/ScalingJobExecutor.java | 6 +-
.../scaling/core/job/FinishedCheckJob.java | 6 +-
.../scaling/core/job/ScalingJob.java | 8 +-
.../core/job/schedule/JobSchedulerCenter.java | 4 +-
...t.java => GovernanceRepositoryAPIImplTest.java} | 26 +-
.../scaling/core/job/FinishedCheckJobTest.java | 10 +-
91 files changed, 476 insertions(+), 610 deletions(-)
diff --git a/docs/document/content/dev-manual/governance.cn.md b/docs/document/content/dev-manual/governance.cn.md
index 2f7d219..652196f 100644
--- a/docs/document/content/dev-manual/governance.cn.md
+++ b/docs/document/content/dev-manual/governance.cn.md
@@ -5,7 +5,7 @@ weight = 9
chapter = true
+++
-## ConfigurationRepository
+## GovernanceRepository
| *SPI 名称* | *详细说明* |
| -------------------------------- | ----------------------- |
@@ -16,17 +16,6 @@ chapter = true
| CuratorZookeeperRepository | 基于 ZooKeeper 的配置中心 |
| EtcdRepository | 基于 etcd 的配置中心 |
-## RegistryRepository
-
-| *SPI 名称* | *详细说明* |
-| -------------------------------- | ----------------------- |
-| RegistryRepository | 注册中心 |
-
-| *已知实现类* | *详细说明* |
-| -------------------------------- | ----------------------- |
-| CuratorZookeeperRepository | 基于 ZooKeeper 的注册中心 |
-| EtcdRepository | 基于 etcd 的注册中心 |
-
## GovernanceListenerFactory
| *SPI 名称* | *详细说明* |
diff --git a/docs/document/content/dev-manual/governance.en.md b/docs/document/content/dev-manual/governance.en.md
index 0215c93..89c745e 100644
--- a/docs/document/content/dev-manual/governance.en.md
+++ b/docs/document/content/dev-manual/governance.en.md
@@ -5,7 +5,7 @@ weight = 9
chapter = true
+++
-## ConfigurationRepository
+## GovernanceRepository
| *SPI Name* | *Description* |
| -------------------------------- | --------------------------- |
@@ -16,17 +16,6 @@ chapter = true
| CuratorZookeeperRepository | ZooKeeper config repository |
| EtcdRepository | etcd config repository |
-## RegistryRepository
-
-| *SPI Name* | *Description* |
-| -------------------------------- | ----------------------------- |
-| RegistryRepository | Registry repository |
-
-| *Implementation Class* | *Description* |
-| -------------------------------- | ----------------------------- |
-| CuratorZookeeperRepository | ZooKeeper registry repository |
-| EtcdRepository | etcd registry repository |
-
## GovernanceListenerFactory
| *SPI Name* | *Description* |
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 f12a71a..72264a5 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
@@ -18,11 +18,11 @@
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.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.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository) {
- super(registryRepository, Collections.singletonList(new RegistryCenterNode().getPrivilegeNodePath()));
+ public PrivilegeNodeChangedListener(final GovernanceRepository governanceRepository) {
+ super(governanceRepository, 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 6765034..05fa25e 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
@@ -18,11 +18,11 @@
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.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.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository) {
- super(registryRepository, Collections.singletonList(new RegistryCenterNode().getUsersNode()));
+ public UserChangedListener(final GovernanceRepository governanceRepository) {
+ super(governanceRepository, 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 f164ed0..57ebd3f 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new PrivilegeNodeChangedListener(registryRepository);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new PrivilegeNodeChangedListener(governanceRepository);
}
@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 1af57a7..9e4daac 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new UserChangedListener(registryRepository);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new UserChangedListener(governanceRepository);
}
@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 99d5adb..56f7487 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,38 +19,27 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
-import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mock;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
public final class PrivilegeNodeChangedListenerTest {
private static final String AUTHENTICATION_YAML = "- root1@:root1\n" + "- root2@:root2\n";
- private PrivilegeNodeChangedListener privilegeNodeChangedListener;
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Before
- public void setUp() {
- privilegeNodeChangedListener = new PrivilegeNodeChangedListener(registryRepository);
- }
-
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = privilegeNodeChangedListener.createEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = new PrivilegeNodeChangedListener(mock(GovernanceRepository.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 a532c6b..296272d 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,41 +19,27 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
public final class UserChangedListenerTest {
private static final String AUTHENTICATION_YAML = "- root1@:root1\n" + "- root2@:root2\n";
- private UserChangedListener userChangedListener;
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Before
- public void setUp() {
- userChangedListener = new UserChangedListener(registryRepository);
- }
-
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = userChangedListener.createEvent(new DataChangedEvent("test", AUTHENTICATION_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = new UserChangedListener(mock(GovernanceRepository.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 9c3b5b0..eece24e 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
@@ -55,8 +55,8 @@ 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.getRegistryRepository());
- listenerManager = new GovernanceListenerManager(repositoryFacade.getRegistryRepository(), schemaNames.isEmpty()
+ registryCenter = new RegistryCenter(repositoryFacade.getGovernanceRepository());
+ listenerManager = new GovernanceListenerManager(repositoryFacade.getGovernanceRepository(), 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/GovernanceRepositoryFacade.java
index e3119e5..eb409f4 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/GovernanceRepositoryFacade.java
@@ -19,11 +19,11 @@ package org.apache.shardingsphere.governance.core.facade.repository;
import com.google.common.base.Preconditions;
import lombok.Getter;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPIRegistry;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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.
@@ -32,25 +32,25 @@ import org.apache.shardingsphere.governance.repository.api.config.GovernanceConf
public final class GovernanceRepositoryFacade implements AutoCloseable {
static {
- ShardingSphereServiceLoader.register(RegistryRepository.class);
+ ShardingSphereServiceLoader.register(GovernanceRepository.class);
}
- private final RegistryRepository registryRepository;
+ private final GovernanceRepository governanceRepository;
public GovernanceRepositoryFacade(final GovernanceConfiguration config) {
- registryRepository = createRegistryRepository(config);
+ governanceRepository = createGovernanceRepository(config);
}
- private RegistryRepository createRegistryRepository(final GovernanceConfiguration config) {
- GovernanceCenterConfiguration registryCenterConfig = config.getRegistryCenterConfiguration();
- Preconditions.checkNotNull(registryCenterConfig, "Registry center configuration cannot be null.");
- RegistryRepository result = TypedSPIRegistry.getRegisteredService(RegistryRepository.class, registryCenterConfig.getType(), registryCenterConfig.getProps());
- result.init(config.getName(), registryCenterConfig);
+ private GovernanceRepository 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());
+ result.init(config.getName(), governanceCenterConfig);
return result;
}
@Override
public void close() {
- registryRepository.close();
+ governanceRepository.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 5714e3b..41e87e8 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
@@ -18,26 +18,23 @@
package org.apache.shardingsphere.governance.core.registry;
import com.google.common.base.Joiner;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import java.util.UUID;
/**
* Registry cache manager.
*/
+@RequiredArgsConstructor
public final class RegistryCacheManager {
private static final String PATH_SEPARATOR = "/";
- private final RegistryRepository repository;
+ private final GovernanceRepository repository;
private final RegistryCenterNode node;
- public RegistryCacheManager(final RegistryRepository repository, final RegistryCenterNode node) {
- this.repository = repository;
- this.node = node;
- }
-
/**
* Cache configuration.
*
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 932da85..180cc4d 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
@@ -21,6 +21,11 @@ import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.eventbus.Subscribe;
+import org.apache.shardingsphere.governance.core.lock.node.LockAck;
+import org.apache.shardingsphere.governance.core.lock.node.LockNode;
+import org.apache.shardingsphere.governance.core.registry.checker.RuleConfigurationChecker;
+import org.apache.shardingsphere.governance.core.registry.checker.RuleConfigurationCheckerFactory;
+import org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
import org.apache.shardingsphere.governance.core.registry.listener.event.datasource.DataSourceAddedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.datasource.DataSourceAlteredEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.invocation.ExecuteProcessSummaryReportEvent;
@@ -33,16 +38,11 @@ import org.apache.shardingsphere.governance.core.registry.listener.event.rule.Ru
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.RuleConfigurationsAlteredEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.SwitchRuleConfigurationEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.scaling.StartScalingEvent;
-import org.apache.shardingsphere.governance.core.lock.node.LockAck;
-import org.apache.shardingsphere.governance.core.lock.node.LockNode;
-import org.apache.shardingsphere.governance.core.registry.checker.RuleConfigurationChecker;
-import org.apache.shardingsphere.governance.core.registry.checker.RuleConfigurationCheckerFactory;
-import org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
import org.apache.shardingsphere.governance.core.yaml.config.YamlConfigurationConverter;
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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
@@ -50,12 +50,12 @@ import org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcess
import org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessUnit;
import org.apache.shardingsphere.infra.executor.sql.process.model.yaml.YamlExecuteProcessContext;
import org.apache.shardingsphere.infra.executor.sql.process.model.yaml.YamlExecuteProcessUnit;
-import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUsersConfigurationConverter;
import org.apache.shardingsphere.infra.metadata.mapper.event.dcl.impl.CreateUserStatementEvent;
import org.apache.shardingsphere.infra.metadata.mapper.event.dcl.impl.GrantStatementEvent;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.refresher.event.SchemaAlteredEvent;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUsersConfigurationConverter;
import org.apache.shardingsphere.infra.rule.event.impl.DataSourceDisabledEvent;
import org.apache.shardingsphere.infra.rule.event.impl.PrimaryDataSourceEvent;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
@@ -87,7 +87,7 @@ public final class RegistryCenter {
private final RegistryCenterNode node;
- private final RegistryRepository repository;
+ private final GovernanceRepository repository;
private final GovernanceInstance instance;
@@ -95,13 +95,13 @@ public final class RegistryCenter {
private final RegistryCacheManager registryCacheManager;
- public RegistryCenter(final RegistryRepository registryRepository) {
+ public RegistryCenter(final GovernanceRepository governanceRepository) {
node = new RegistryCenterNode();
- repository = registryRepository;
+ repository = governanceRepository;
instance = GovernanceInstance.getInstance();
lockNode = new LockNode();
initLockNode();
- registryCacheManager = new RegistryCacheManager(registryRepository, node);
+ registryCacheManager = new RegistryCacheManager(governanceRepository, 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 45d8702..1c16034 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 registryRepository registry repository
+ * @param governanceRepository governance repository
* @param schemaNames schema names
* @return governance listener
*/
- GovernanceListener create(RegistryRepository registryRepository, Collection<String> schemaNames);
+ GovernanceListener create(GovernanceRepository governanceRepository, 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 d931254..38781f4 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository;
+ private final GovernanceRepository governanceRepository;
private final Collection<String> schemaNames;
private final Collection<GovernanceListenerFactory> governanceListenerFactories;
- public GovernanceListenerManager(final RegistryRepository registryRepository, final Collection<String> schemaNames) {
- this.registryRepository = registryRepository;
+ public GovernanceListenerManager(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ this.governanceRepository = governanceRepository;
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(registryRepository, schemaNames).watch(each.getWatchTypes().toArray(new Type[0]));
+ each.create(governanceRepository, 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/factory/DataSourceChangedListenerFactory.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/factory/DataSourceChangedListenerFactory.java
index 1bf280d..c0cf3d1 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,11 +20,11 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
/**
* Data source changed listener factory.
@@ -32,12 +32,12 @@ import java.util.Collection;
public final class DataSourceChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new DataSourceChangedListener(registryRepository, schemaNames);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new DataSourceChangedListener(governanceRepository, schemaNames);
}
@Override
public Collection<Type> getWatchTypes() {
- return Arrays.asList(Type.UPDATED);
+ return Collections.singletonList(Type.UPDATED);
}
}
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 f386255..3a1fc44 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new DataSourceStateChangedListener(registryRepository, schemaNames);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new DataSourceStateChangedListener(governanceRepository, 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 3eba21f..819b1e7 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new LockChangedListener(registryRepository);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new LockChangedListener(governanceRepository);
}
@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 bfc2c65..f68c0df 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new MetaDataChangedListener(registryRepository, schemaNames);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new MetaDataChangedListener(governanceRepository, 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 2db0de7..32cd750 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new PropertiesChangedListener(registryRepository);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new PropertiesChangedListener(governanceRepository);
}
@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 4a11624..9fda3da 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,11 +20,11 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
/**
* Rule changed listener factory.
@@ -32,12 +32,12 @@ import java.util.Collection;
public final class RuleChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new RuleChangedListener(registryRepository, schemaNames);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new RuleChangedListener(governanceRepository, schemaNames);
}
@Override
public Collection<Type> getWatchTypes() {
- return Arrays.asList(Type.UPDATED);
+ return Collections.singletonList(Type.UPDATED);
}
}
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 08758f7..a2c4701 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,11 +20,11 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
/**
* Schema changed listener factory.
@@ -32,12 +32,12 @@ import java.util.Collection;
public final class SchemaChangedListenerFactory implements GovernanceListenerFactory {
@Override
- public GovernanceListener create(final RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new SchemaChangedListener(registryRepository, schemaNames);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new SchemaChangedListener(governanceRepository, schemaNames);
}
@Override
public Collection<Type> getWatchTypes() {
- return Arrays.asList(Type.UPDATED);
+ return Collections.singletonList(Type.UPDATED);
}
}
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 27a4898..97af21a 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- return new TerminalStateChangedListener(registryRepository);
+ public GovernanceListener create(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ return new TerminalStateChangedListener(governanceRepository);
}
@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 b9b3c0c..1a94ae6 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
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
import com.google.common.base.Strings;
+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.datasource.DataSourceChangedEvent;
-import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfigurationWrap;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- super(registryRepository, new RegistryCenterNode().getAllDataSourcePaths(schemaNames));
+ public DataSourceChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ super(governanceRepository, 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 e3a2b71..12f7289 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
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
-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.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus;
+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.readwritesplitting.DisabledStateChangedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.readwritesplitting.PrimaryStateChangedEvent;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- super(registryRepository, new RegistryCenterNode().getAllSchemaPaths(schemaNames));
+ public DataSourceStateChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ super(governanceRepository, 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 470e481..c185982 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository) {
- super(registryRepository, Collections.singleton(new RegistryCenterNode().getGlobalRuleNode()));
+ public GlobalRuleChangedListener(final GovernanceRepository governanceRepository) {
+ super(governanceRepository, 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 b6b5bfc..1d9cbca 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
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
+import org.apache.shardingsphere.governance.core.lock.node.LockNode;
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.lock.LockNotificationEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.lock.LockReleasedEvent;
-import org.apache.shardingsphere.governance.core.lock.node.LockNode;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository) {
- super(registryRepository, Collections.singleton(new LockNode().getLockRootNodePath()));
+ public LockChangedListener(final GovernanceRepository governanceRepository) {
+ super(governanceRepository, 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 c413b15..a688497 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
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.commons.collections4.SetUtils;
+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.metadata.MetaDataDeletedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.metadata.MetaDataPersistedEvent;
-import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- super(registryRepository, Collections.singleton(new RegistryCenterNode().getMetadataNodePath()));
+ public MetaDataChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ super(governanceRepository, 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 9c729cf..221aaa4 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
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
+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.core.registry.RegistryCenterNode;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository) {
- super(registryRepository, Collections.singletonList(new RegistryCenterNode().getPropsPath()));
+ public PropertiesChangedListener(final GovernanceRepository governanceRepository) {
+ super(governanceRepository, 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 22301c3..0f45a08 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
@@ -19,13 +19,13 @@ package org.apache.shardingsphere.governance.core.registry.listener.impl;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+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.rule.RuleConfigurationCachedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.RuleConfigurationsChangedEvent;
-import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
import org.apache.shardingsphere.governance.core.yaml.config.YamlRuleConfigurationWrap;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- super(registryRepository, new RegistryCenterNode().getAllRulePaths(schemaNames));
+ public RuleChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ super(governanceRepository, 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 ebe97e5..9d9234d 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
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
+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.schema.SchemaChangedEvent;
-import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode;
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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository, final Collection<String> schemaNames) {
- super(registryRepository, new RegistryCenterNode().getAllMetadataSchemaPaths(schemaNames));
+ public SchemaChangedListener(final GovernanceRepository governanceRepository, final Collection<String> schemaNames) {
+ super(governanceRepository, 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 4f38a0c..5af4ae2 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
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
-import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanceRepositoryEventListener;
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.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.core.registry.listener.PostGovernanceRepositoryEventListener;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository) {
- super(registryRepository, Collections.singleton(new RegistryCenterNode().getProxyNodePath(GovernanceInstance.getInstance().getInstanceId())));
+ public TerminalStateChangedListener(final GovernanceRepository governanceRepository) {
+ super(governanceRepository, Collections.singleton(new RegistryCenterNode().getProxyNodePath(GovernanceInstance.getInstance().getInstanceId())));
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java
index 722c555..ca32d16 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java
@@ -33,7 +33,7 @@ public final class GovernanceConfigurationYamlSwapper implements YamlConfigurati
public YamlGovernanceConfiguration swapToYamlConfiguration(final GovernanceConfiguration data) {
YamlGovernanceConfiguration result = new YamlGovernanceConfiguration();
result.setName(data.getName());
- result.setRegistryCenter(governanceCenterConfigurationSwapper.swapToYamlConfiguration(data.getRegistryCenterConfiguration()));
+ result.setRegistryCenter(governanceCenterConfigurationSwapper.swapToYamlConfiguration(data.getGovernanceCenterConfiguration()));
return result;
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllGovernanceRepository.java
similarity index 93%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllGovernanceRepository.java
index 8bc2947..8f89407 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllGovernanceRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 TestAllRepository implements RegistryRepository {
+public final class TestAllGovernanceRepository implements GovernanceRepository {
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
@@ -50,21 +50,20 @@ public final class TestAllRepository implements RegistryRepository {
}
@Override
- public boolean tryLock(final String key, final long time, final TimeUnit unit) {
- return false;
+ public void delete(final String key) {
}
@Override
- public void releaseLock(final String key) {
-
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
- public void delete(final String key) {
+ public boolean tryLock(final String key, final long time, final TimeUnit unit) {
+ return false;
}
@Override
- public void watch(final String key, final DataChangedEventListener listener) {
+ public void releaseLock(final String key) {
}
@Override
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestGovernanceRepository.java
similarity index 93%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestGovernanceRepository.java
index f903eb7..24a8641 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestGovernanceRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 TestRegistryRepository implements RegistryRepository {
+public final class TestGovernanceRepository implements GovernanceRepository {
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
@@ -50,20 +50,20 @@ public final class TestRegistryRepository implements RegistryRepository {
}
@Override
- public boolean tryLock(final String key, final long time, final TimeUnit unit) {
- return false;
+ public void delete(final String key) {
}
@Override
- public void releaseLock(final String key) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
- public void delete(final String key) {
+ public boolean tryLock(final String key, final long time, final TimeUnit unit) {
+ return false;
}
@Override
- public void watch(final String key, final DataChangedEventListener listener) {
+ public void releaseLock(final String key) {
}
@Override
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 ef7c1fa..78bf92a 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
@@ -21,17 +21,17 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration;
import org.apache.shardingsphere.dbdiscovery.api.config.DatabaseDiscoveryRuleConfiguration;
import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
+import org.apache.shardingsphere.governance.core.lock.node.LockNode;
import org.apache.shardingsphere.governance.core.registry.listener.event.datasource.DataSourceAddedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.datasource.DataSourceAlteredEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.metadata.MetaDataCreatedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.metadata.MetaDataDroppedEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.RuleConfigurationsAlteredEvent;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.SwitchRuleConfigurationEvent;
-import org.apache.shardingsphere.governance.core.lock.node.LockNode;
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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
@@ -72,6 +72,7 @@ import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -110,7 +111,7 @@ public final class RegistryCenterTest {
private static final String META_DATA_YAML = "yaml/schema.yaml";
@Mock
- private RegistryRepository registryRepository;
+ private GovernanceRepository governanceRepository;
@Mock
private RegistryCacheManager registryCacheManager;
@@ -119,211 +120,211 @@ public final class RegistryCenterTest {
@Before
public void setUp() throws ReflectiveOperationException {
- registryCenter = new RegistryCenter(registryRepository);
+ registryCenter = new RegistryCenter(governanceRepository);
Field field = registryCenter.getClass().getDeclaredField("repository");
field.setAccessible(true);
- field.set(registryCenter, registryRepository);
+ field.set(registryCenter, governanceRepository);
}
@Test
public void assertPersistInstanceOnline() {
registryCenter.persistInstanceOnline();
- verify(registryRepository).persistEphemeral(anyString(), anyString());
+ verify(governanceRepository).persistEphemeral(anyString(), anyString());
}
@Test
public void assertPersistDataSourcesNode() {
registryCenter.persistDataNodes();
- verify(registryRepository).persist("/states/datanodes", "");
+ verify(governanceRepository).persist("/states/datanodes", "");
}
@Test
public void assertPersistInstanceData() {
registryCenter.persistInstanceData("test");
- verify(registryRepository).persist(anyString(), eq("test"));
+ verify(governanceRepository).persist(anyString(), eq("test"));
}
@Test
public void assertLoadInstanceData() {
registryCenter.loadInstanceData();
- verify(registryRepository).get(anyString());
+ verify(governanceRepository).get(anyString());
}
@Test
public void assertLoadDisabledDataSources() {
List<String> disabledDataSources = Collections.singletonList("replica_ds_0");
- when(registryRepository.getChildrenKeys(anyString())).thenReturn(disabledDataSources);
+ when(governanceRepository.getChildrenKeys(anyString())).thenReturn(disabledDataSources);
registryCenter.loadDisabledDataSources("replica_query_db");
- verify(registryRepository).getChildrenKeys(anyString());
- verify(registryRepository).get(anyString());
+ verify(governanceRepository).getChildrenKeys(anyString());
+ verify(governanceRepository).get(anyString());
}
@Test
public void assertTryLock() {
registryCenter.tryLock("test", 50L);
- verify(registryRepository).tryLock(eq(new LockNode().getLockNodePath("test")), eq(50L), eq(TimeUnit.MILLISECONDS));
+ verify(governanceRepository).tryLock(eq(new LockNode().getLockNodePath("test")), eq(50L), eq(TimeUnit.MILLISECONDS));
}
@Test
public void assertReleaseLock() {
registryCenter.releaseLock("test");
- verify(registryRepository).releaseLock(eq(new LockNode().getLockNodePath("test")));
+ verify(governanceRepository).releaseLock(eq(new LockNode().getLockNodePath("test")));
}
@Test
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertMoreSchema() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(registryRepository, times(0)).persist("/metadata", "myTest1,myTest2,sharding_db");
+ verify(governanceRepository, times(0)).persist("/metadata", "myTest1,myTest2,sharding_db");
}
@Test
public void assertMoreAndContainsSchema() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(registryRepository, times(0)).persist("/metadata", "myTest1,sharding_db");
+ verify(governanceRepository, times(0)).persist("/metadata", "myTest1,sharding_db");
}
@Test
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForReplicaQueryRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReplicaQueryRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReadwriteSplittingWithoutAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForDatabaseDiscoveryRuleWithoutAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createDatabaseDiscoveryRuleConfiguration(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
}
@Test
public void assertPersistConfigurationForShardingRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForShardingRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForShardingRuleWithAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHARDING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForReplicaQueryRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReadwriteSplittingRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), false);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository).persist(eq("/metadata/sharding_db/rule"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/rule"), any());
}
@Test
public void assertPersistConfigurationForReadwriteSplittingRuleWithAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createReadwriteSplittingRuleConfiguration(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(READWRITE_SPLITTING_RULE_YAML));
}
@Test
public void assertPersistConfigurationForDatabaseDiscoveryRuleWithAuthenticationAndIsOverwrite() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createDatabaseDiscoveryRuleConfiguration(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(DB_DISCOVERY_RULE_YAML));
}
@Test
public void assertPersistConfigurationForEncrypt() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createEncryptRuleConfiguration(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(ENCRYPT_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(ENCRYPT_RULE_YAML));
}
@Test
public void assertNullRuleConfiguration() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), Collections.emptyList(), true);
}
@Test
public void assertPersistConfigurationForShadow() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createShadowRuleConfiguration(), true);
- verify(registryRepository).persist(eq("/metadata/sharding_db/datasource"), any());
- verify(registryRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHADOW_RULE_YAML));
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/datasource"), any());
+ verify(governanceRepository, times(0)).persist("/metadata/sharding_db/rule", readYAML(SHADOW_RULE_YAML));
}
@Test
public void assertPersistGlobalConfiguration() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistGlobalConfiguration(createProperties(), true);
- verify(registryRepository, times(0)).persist("/users", readYAML(USERS_YAML));
- verify(registryRepository).persist("/props", PROPS_YAML);
+ verify(governanceRepository, times(0)).persist("/users", readYAML(USERS_YAML));
+ verify(governanceRepository).persist("/props", PROPS_YAML);
}
private Map<String, DataSourceConfiguration> createDataSourceConfigurations() {
@@ -379,8 +380,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDataSourceConfigurations() {
- when(registryRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAM));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAM));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Map<String, DataSourceConfiguration> actual = registryCenter.loadDataSourceConfigurations("sharding_db");
assertThat(actual.size(), is(2));
assertDataSourceConfiguration(actual.get("ds_0"), createDataSourceConfiguration(createDataSource("ds_0")));
@@ -396,16 +397,16 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDataSourceConfigurationsNotExistPath() {
- when(registryRepository.get("/metadata/sharding_db/datasource")).thenReturn("");
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn("");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Map<String, DataSourceConfiguration> actual = registryCenter.loadDataSourceConfigurations("sharding_db");
assertThat(actual.size(), is(0));
}
@Test
public void assertLoadShardingAndEncryptRuleConfiguration() {
- when(registryRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_AND_ENCRYPT_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_AND_ENCRYPT_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<RuleConfiguration> ruleConfigurations = registryCenter.loadRuleConfigurations("sharding_db");
assertThat(ruleConfigurations.size(), is(2));
for (RuleConfiguration each : ruleConfigurations) {
@@ -425,8 +426,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadShardingRuleConfiguration() {
- when(registryRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHARDING_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<RuleConfiguration> actual = registryCenter.loadRuleConfigurations("sharding_db");
assertThat(actual.size(), is(1));
ShardingRuleConfiguration actualShardingRuleConfig = (ShardingRuleConfiguration) actual.iterator().next();
@@ -436,8 +437,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadReadwriteSplittingRuleConfiguration() {
- when(registryRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(READWRITE_SPLITTING_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(READWRITE_SPLITTING_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<RuleConfiguration> actual = registryCenter.loadRuleConfigurations("sharding_db");
ReadwriteSplittingRuleConfiguration config = (ReadwriteSplittingRuleConfiguration) actual.iterator().next();
assertThat(config.getDataSources().size(), is(1));
@@ -447,8 +448,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDatabaseDiscoveryRuleConfiguration() {
- when(registryRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(DB_DISCOVERY_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(DB_DISCOVERY_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<RuleConfiguration> actual = registryCenter.loadRuleConfigurations("sharding_db");
DatabaseDiscoveryRuleConfiguration config = (DatabaseDiscoveryRuleConfiguration) actual.iterator().next();
assertThat(config.getDataSources().size(), is(1));
@@ -457,8 +458,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadEncryptRuleConfiguration() {
- when(registryRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(ENCRYPT_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(ENCRYPT_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
EncryptRuleConfiguration actual = (EncryptRuleConfiguration) registryCenter.loadRuleConfigurations("sharding_db").iterator().next();
assertThat(actual.getEncryptors().size(), is(1));
ShardingSphereAlgorithmConfiguration encryptAlgorithmConfig = actual.getEncryptors().get("order_encryptor");
@@ -468,8 +469,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadShadowRuleConfiguration() {
- when(registryRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHADOW_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/rule")).thenReturn(readYAML(SHADOW_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
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")));
@@ -478,8 +479,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadUsers() {
- when(registryRepository.get("/users")).thenReturn(readYAML(USERS_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/users")).thenReturn(readYAML(USERS_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<ShardingSphereUser> actual = registryCenter.loadUsers();
Optional<ShardingSphereUser> user = actual.stream().filter(each -> each.getGrantee().equals(new Grantee("root1", ""))).findFirst();
assertTrue(user.isPresent());
@@ -488,18 +489,18 @@ public final class RegistryCenterTest {
@Test
public void assertLoadProperties() {
- when(registryRepository.get("/props")).thenReturn(PROPS_YAML);
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/props")).thenReturn(PROPS_YAML);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Properties actual = registryCenter.loadProperties();
assertThat(actual.get(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(Boolean.FALSE));
}
@Test
public void assertLoadGlobalRuleConfigurations() {
- when(registryRepository.get("/rule")).thenReturn(readYAML(GLOBAL_RULE_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/rule")).thenReturn(readYAML(GLOBAL_RULE_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<RuleConfiguration> globalRuleConfigs = registryCenter.loadGlobalRuleConfigurations();
- assertTrue(!globalRuleConfigs.isEmpty());
+ assertFalse(globalRuleConfigs.isEmpty());
Collection<ShardingSphereUser> users = globalRuleConfigs.stream().filter(each -> each instanceof AuthorityRuleConfiguration)
.flatMap(each -> ((AuthorityRuleConfiguration) each).getUsers().stream()).collect(Collectors.toList());
Optional<ShardingSphereUser> user = users.stream().filter(each -> each.getGrantee().equals(new Grantee("root", ""))).findFirst();
@@ -508,15 +509,15 @@ public final class RegistryCenterTest {
Collection<ShardingSphereAlgorithmConfiguration> providers = globalRuleConfigs.stream()
.filter(each -> each instanceof AuthorityRuleConfiguration && Objects.nonNull(((AuthorityRuleConfiguration) each).getProvider()))
.map(each -> ((AuthorityRuleConfiguration) each).getProvider()).collect(Collectors.toList());
- assertTrue(!providers.isEmpty());
+ assertFalse(providers.isEmpty());
Optional<ShardingSphereAlgorithmConfiguration> nativeProvider = providers.stream().filter(each -> "NATIVE".equals(each.getType())).findFirst();
assertTrue(nativeProvider.isPresent());
}
@Test
public void assertGetAllSchemaNames() {
- when(registryRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Collection<String> actual = registryCenter.getAllSchemaNames();
assertThat(actual.size(), is(2));
assertThat(actual, hasItems("sharding_db"));
@@ -525,8 +526,8 @@ public final class RegistryCenterTest {
@Test
public void assertLoadDataSourceConfigurationsWithConnectionInitSqls() {
- when(registryRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAML_WITH_CONNECTION_INIT_SQL));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn(readYAML(DATA_SOURCE_YAML_WITH_CONNECTION_INIT_SQL));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
Map<String, DataSourceConfiguration> actual = registryCenter.loadDataSourceConfigurations("sharding_db");
assertThat(actual.size(), is(2));
assertDataSourceConfigurationWithConnectionInitSqls(actual.get("ds_0"), createDataSourceConfiguration(createDataSourceWithConnectionInitSqls("ds_0")));
@@ -559,32 +560,32 @@ public final class RegistryCenterTest {
@Test
public void assertPersistSchemaNameWithExistSchema() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
- when(registryRepository.get("/metadata")).thenReturn("sharding_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("sharding_db");
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(registryRepository, times(0)).persist(eq("/metadata"), eq("sharding_db"));
+ verify(governanceRepository, times(0)).persist(eq("/metadata"), eq("sharding_db"));
}
@Test
public void assertPersistSchemaNameWithExistAndNewSchema() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
- when(registryRepository.get("/metadata")).thenReturn("replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("replica_query_db");
registryCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), true);
- verify(registryRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
+ verify(governanceRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
}
@Test
public void assertRenewDataSourceEvent() {
DataSourceAddedEvent event = new DataSourceAddedEvent("sharding_db", createDataSourceConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
+ verify(governanceRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
}
@Test
public void assertRenewDataSourceEventHasDataSourceConfig() {
DataSourceAddedEvent event = new DataSourceAddedEvent("sharding_db", createDataSourceConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
String dataSourceYaml = "dataSources:\n"
+ " ds_0:\n"
+ " dataSourceClassName: xxx\n"
@@ -597,73 +598,73 @@ public final class RegistryCenterTest {
+ " maxPoolSize: 50\n"
+ " minPoolSize: 1\n"
+ " maintenanceIntervalMilliseconds: 30000\n";
- when(registryRepository.get("/metadata/sharding_db/datasource")).thenReturn(dataSourceYaml);
+ when(governanceRepository.get("/metadata/sharding_db/datasource")).thenReturn(dataSourceYaml);
registryCenter.renew(event);
- verify(registryRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
+ verify(governanceRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
}
@Test
public void assertRenewRuleEvent() {
RuleConfigurationsAlteredEvent event = new RuleConfigurationsAlteredEvent("sharding_db", createRuleConfigurations());
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository).persist(startsWith("/metadata/sharding_db/rule"), anyString());
+ verify(governanceRepository).persist(startsWith("/metadata/sharding_db/rule"), anyString());
}
@Test
public void assertRenewSchemaNameEventWithDrop() {
MetaDataDroppedEvent event = new MetaDataDroppedEvent("sharding_db");
- when(registryRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository).persist(eq("/metadata"), eq("replica_query_db"));
+ verify(governanceRepository).persist(eq("/metadata"), eq("replica_query_db"));
}
@Test
public void assertRenewSchemaNameEventWithDropAndNotExist() {
MetaDataDroppedEvent event = new MetaDataDroppedEvent("sharding_db");
- when(registryRepository.get("/metadata")).thenReturn("replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository, times(0)).persist(eq("/metadata"), eq("replica_query_db"));
+ verify(governanceRepository, times(0)).persist(eq("/metadata"), eq("replica_query_db"));
}
@Test
public void assertRenewSchemaNameEventWithAdd() {
MetaDataCreatedEvent event = new MetaDataCreatedEvent("sharding_db");
- when(registryRepository.get("/metadata")).thenReturn("replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
+ verify(governanceRepository).persist(eq("/metadata"), eq("replica_query_db,sharding_db"));
}
@Test
public void assertRenewSchemaNameEventWithAddAndExist() {
MetaDataCreatedEvent event = new MetaDataCreatedEvent("sharding_db");
- when(registryRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata")).thenReturn("sharding_db,replica_query_db");
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository, times(0)).persist(eq("/metadata"), eq("sharding_db,replica_query_db"));
+ verify(governanceRepository, 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(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.persistSchema("sharding_db", schema);
- verify(registryRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
}
@Test
public void assertLoadSchema() {
- when(registryRepository.get("/metadata/sharding_db/schema")).thenReturn(readYAML(META_DATA_YAML));
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ when(governanceRepository.get("/metadata/sharding_db/schema")).thenReturn(readYAML(META_DATA_YAML));
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
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(registryRepository).get(eq("/metadata/sharding_db/schema"));
+ verify(governanceRepository).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));
@@ -673,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(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
+ verify(governanceRepository).persist(eq("/metadata/sharding_db/schema"), anyString());
}
@Test
public void assertDeleteSchema() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.deleteSchema("sharding_db");
- verify(registryRepository).delete(eq("/metadata/sharding_db"));
+ verify(governanceRepository).delete(eq("/metadata/sharding_db"));
}
@Test
@SneakyThrows
public void assertRenewSwitchRuleConfigurationEvent() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
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(registryRepository).persist(eq("/metadata/sharding_db/rule"), anyString());
+ verify(governanceRepository).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(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.renew(event);
- verify(registryRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
+ verify(governanceRepository).persist(startsWith("/metadata/sharding_db/datasource"), anyString());
}
@Test
public void assertDeleteLockAck() {
- RegistryCenter registryCenter = new RegistryCenter(registryRepository);
+ RegistryCenter registryCenter = new RegistryCenter(governanceRepository);
registryCenter.deleteLockAck("test");
- verify(registryRepository).delete(anyString());
+ verify(governanceRepository).delete(anyString());
}
}
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 4df309e..8a298e6 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(getRegistryRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db", "encrypt_db"));
+ dataSourceChangedListener = new DataSourceChangedListener(getGovernanceRepository(), 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 5f0c802..ecdd1a7 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,14 +20,10 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Optional;
@@ -35,23 +31,13 @@ import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
public final class DataSourceStateChangedListenerTest {
- private DataSourceStateChangedListener dataSourceStateChangedListener;
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Before
- public void setUp() {
- dataSourceStateChangedListener = new DataSourceStateChangedListener(registryRepository, Arrays.asList("sharding_db", "replica_query_db", "encrypt_db"));
- }
-
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = dataSourceStateChangedListener.createEvent(
+ Optional<GovernanceEvent> actual = new DataSourceStateChangedListener(mock(GovernanceRepository.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 ef47a55..6e972a5 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository registryRepository;
+ private GovernanceRepository governanceRepository;
@Before
public void setUp() {
- globalRuleChangedListener = new GlobalRuleChangedListener(registryRepository);
+ globalRuleChangedListener = new GlobalRuleChangedListener(governanceRepository);
}
@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 527c8f7..0c0aaf0 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,35 +18,21 @@
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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
public final class LockChangedListenerTest {
- private LockChangedListener lockChangedListener;
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Before
- public void setUp() {
- lockChangedListener = new LockChangedListener(registryRepository);
- }
-
@Test
public void assertCreateEventWithInvalidPath() {
- Optional<GovernanceEvent> actual = lockChangedListener.createEvent(new DataChangedEvent("/lock/glock", "", Type.ADDED));
+ Optional<GovernanceEvent> actual = new LockChangedListener(mock(GovernanceRepository.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 e5c7061..2235f9b 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(getRegistryRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db"));
+ metaDataChangedListener = new MetaDataChangedListener(getGovernanceRepository(), 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 3ac33c9..68aeb7d 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.mockito.Mock;
import java.io.IOException;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
public class MetaDataListenerTest {
@Mock
- private RegistryRepository registryRepository;
+ private GovernanceRepository governanceRepository;
@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 dc423a6..e066704 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,40 +19,26 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
public final class PropertiesChangedListenerTest {
private static final String PROPERTIES_YAML = ConfigurationPropertyKey.SQL_SHOW.getKey() + ": true";
- private PropertiesChangedListener propertiesChangedListener;
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Before
- public void setUp() {
- propertiesChangedListener = new PropertiesChangedListener(registryRepository);
- }
-
@Test
public void assertCreateEvent() {
- Optional<GovernanceEvent> actual = propertiesChangedListener.createEvent(new DataChangedEvent("test", PROPERTIES_YAML, Type.UPDATED));
+ Optional<GovernanceEvent> actual = new PropertiesChangedListener(mock(GovernanceRepository.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 85fb600..c10a81e 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(getRegistryRepository(), Arrays.asList("sharding_db", "replica_query_db", "encrypt_db"));
+ ruleChangedListener = new RuleChangedListener(getGovernanceRepository(), 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 cc447b2..4ef6dda 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(getRegistryRepository(), Arrays.asList("sharding_db", "readwrite_splitting_db", "encrypt_db"));
+ schemaChangedListener = new SchemaChangedListener(getGovernanceRepository(), 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 956509b..4af46e5 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,33 +18,21 @@
package org.apache.shardingsphere.governance.core.registry.listener.impl;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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;
-import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import java.util.Optional;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
public final class TerminalStateChangedListenerTest {
- private TerminalStateChangedListener terminalStateChangedListener;
-
- @Mock
- private RegistryRepository registryRepository;
-
- @Before
- public void setUp() {
- terminalStateChangedListener = new TerminalStateChangedListener(registryRepository);
- }
+ private final TerminalStateChangedListener terminalStateChangedListener = new TerminalStateChangedListener(mock(GovernanceRepository.class));
@Test
public void assertCreateEventWhenEnabled() {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java
index 1feaa11..dbf197a 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java
@@ -36,9 +36,9 @@ public final class GovernanceConfigurationYamlSwapperTest {
YamlGovernanceConfiguration actual = new GovernanceConfigurationYamlSwapper().swapToYamlConfiguration(expected);
assertThat(actual.getName(), is(expected.getName()));
assertThat(actual.isOverwrite(), is(expected.isOverwrite()));
- assertThat(actual.getRegistryCenter().getType(), is(expected.getRegistryCenterConfiguration().getType()));
- assertThat(actual.getRegistryCenter().getServerLists(), is(expected.getRegistryCenterConfiguration().getServerLists()));
- assertThat(actual.getRegistryCenter().getProps(), is(expected.getRegistryCenterConfiguration().getProps()));
+ assertThat(actual.getRegistryCenter().getType(), is(expected.getGovernanceCenterConfiguration().getType()));
+ assertThat(actual.getRegistryCenter().getServerLists(), is(expected.getGovernanceCenterConfiguration().getServerLists()));
+ assertThat(actual.getRegistryCenter().getProps(), is(expected.getGovernanceCenterConfiguration().getProps()));
}
private GovernanceConfiguration createGovernanceConfigurationWithoutAdditionalConfigCenterConfiguration() {
@@ -51,9 +51,9 @@ public final class GovernanceConfigurationYamlSwapperTest {
YamlGovernanceConfiguration actual = new GovernanceConfigurationYamlSwapper().swapToYamlConfiguration(expected);
assertThat(actual.getName(), is(expected.getName()));
assertThat(actual.isOverwrite(), is(expected.isOverwrite()));
- assertThat(actual.getRegistryCenter().getType(), is(expected.getRegistryCenterConfiguration().getType()));
- assertThat(actual.getRegistryCenter().getServerLists(), is(expected.getRegistryCenterConfiguration().getServerLists()));
- assertThat(actual.getRegistryCenter().getProps(), is(expected.getRegistryCenterConfiguration().getProps()));
+ assertThat(actual.getRegistryCenter().getType(), is(expected.getGovernanceCenterConfiguration().getType()));
+ assertThat(actual.getRegistryCenter().getServerLists(), is(expected.getGovernanceCenterConfiguration().getServerLists()));
+ assertThat(actual.getRegistryCenter().getProps(), is(expected.getGovernanceCenterConfiguration().getProps()));
}
private GovernanceConfiguration createGovernanceConfigurationWithAdditionalConfigCenterConfiguration() {
@@ -67,9 +67,9 @@ public final class GovernanceConfigurationYamlSwapperTest {
GovernanceConfiguration actual = new GovernanceConfigurationYamlSwapper().swapToObject(expected);
assertThat(actual.getName(), is(expected.getName()));
assertThat(actual.isOverwrite(), is(expected.isOverwrite()));
- assertThat(actual.getRegistryCenterConfiguration().getType(), is(expected.getRegistryCenter().getType()));
- assertThat(actual.getRegistryCenterConfiguration().getServerLists(), is(expected.getRegistryCenter().getServerLists()));
- assertThat(actual.getRegistryCenterConfiguration().getProps(), is(expected.getRegistryCenter().getProps()));
+ assertThat(actual.getGovernanceCenterConfiguration().getType(), is(expected.getRegistryCenter().getType()));
+ assertThat(actual.getGovernanceCenterConfiguration().getServerLists(), is(expected.getRegistryCenter().getServerLists()));
+ assertThat(actual.getGovernanceCenterConfiguration().getProps(), is(expected.getRegistryCenter().getProps()));
}
private YamlGovernanceConfiguration createYamlGovernanceConfigurationWithoutAdditionalConfigCenterConfiguration() {
@@ -85,9 +85,9 @@ public final class GovernanceConfigurationYamlSwapperTest {
GovernanceConfiguration actual = new GovernanceConfigurationYamlSwapper().swapToObject(expected);
assertThat(actual.getName(), is(expected.getName()));
assertThat(actual.isOverwrite(), is(expected.isOverwrite()));
- assertThat(actual.getRegistryCenterConfiguration().getType(), is(expected.getRegistryCenter().getType()));
- assertThat(actual.getRegistryCenterConfiguration().getServerLists(), is(expected.getRegistryCenter().getServerLists()));
- assertThat(actual.getRegistryCenterConfiguration().getProps(), is(expected.getRegistryCenter().getProps()));
+ assertThat(actual.getGovernanceCenterConfiguration().getType(), is(expected.getRegistryCenter().getType()));
+ assertThat(actual.getGovernanceCenterConfiguration().getServerLists(), is(expected.getRegistryCenter().getServerLists()));
+ assertThat(actual.getGovernanceCenterConfiguration().getProps(), is(expected.getRegistryCenter().getProps()));
}
private YamlGovernanceConfiguration createYamlGovernanceConfigurationWithAdditionalConfigCenterConfiguration() {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
similarity index 89%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
index 3ad16e2..1856055 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.governance.core.facade.fixture.TestRegistryRepository
-org.apache.shardingsphere.governance.core.facade.fixture.TestAllRepository
+org.apache.shardingsphere.governance.core.facade.fixture.TestGovernanceRepository
+org.apache.shardingsphere.governance.core.facade.fixture.TestAllGovernanceRepository
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/GovernanceRepository.java
index 0f052c5..ecb41fe 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/GovernanceRepository.java
@@ -17,11 +17,12 @@
package org.apache.shardingsphere.governance.repository.api;
-import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
+import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Governance repository.
@@ -34,11 +35,6 @@ public interface GovernanceRepository extends TypedSPI {
String PATH_SEPARATOR = "/";
/**
- * Dot separator.
- */
- String DOT_SEPARATOR = ".";
-
- /**
* Initialize governance center.
*
* @param name governance center name
@@ -57,10 +53,10 @@ public interface GovernanceRepository extends TypedSPI {
String get(String key);
/**
- * Get node's sub-nodes list.
+ * Get names of sub-node.
*
* @param key key of data
- * @return sub-nodes name list
+ * @return sub-node names
*/
List<String> getChildrenKeys(String key);
@@ -73,6 +69,14 @@ public interface GovernanceRepository extends TypedSPI {
void persist(String key, String value);
/**
+ * Persist ephemeral data.
+ *
+ * @param key key of data
+ * @param value value of data
+ */
+ void persistEphemeral(String key, String value);
+
+ /**
* Delete node.
*
* @param key key of data
@@ -88,6 +92,23 @@ public interface GovernanceRepository extends TypedSPI {
void watch(String key, DataChangedEventListener listener);
/**
+ * Try to get lock under the lock key.
+ *
+ * @param key lock key
+ * @param time time to wait
+ * @param unit time unit
+ * @return true if get the lock, false if not
+ */
+ boolean tryLock(String key, long time, TimeUnit unit);
+
+ /**
+ * Release lock.
+ *
+ * @param key lock key
+ */
+ void releaseLock(String key);
+
+ /**
* Close.
*/
void close();
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/RegistryRepository.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/RegistryRepository.java
deleted file mode 100644
index dd49657..0000000
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/RegistryRepository.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.governance.repository.api;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Registry repository.
- */
-public interface RegistryRepository extends GovernanceRepository {
-
- /**
- * Persist ephemeral data.
- *
- * @param key key of data
- * @param value value of data
- */
- void persistEphemeral(String key, String value);
-
- /**
- * Try to get lock under the lock key.
- *
- * @param key lock key
- * @param time time to wait
- * @param unit time unit
- * @return true if get the lock, false if not
- */
- boolean tryLock(String key, long time, TimeUnit unit);
-
- /**
- * Release lock.
- *
- * @param key lock key
- */
- void releaseLock(String key);
-}
diff --git a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/config/GovernanceConfiguration.java b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/config/GovernanceConfiguration.java
index a7fb013..72f05ee 100644
--- a/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/config/GovernanceConfiguration.java
+++ b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-api/src/main/java/org/apache/shardingsphere/governance/repository/api/config/GovernanceConfiguration.java
@@ -29,7 +29,7 @@ public final class GovernanceConfiguration {
private final String name;
- private final GovernanceCenterConfiguration registryCenterConfiguration;
+ private final GovernanceCenterConfiguration governanceCenterConfiguration;
private final boolean overwrite;
}
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 8f3f925..6076a48 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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;
@@ -44,9 +44,9 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
- * Registry repository of ETCD.
+ * Governance repository of ETCD.
*/
-public final class EtcdRepository implements RegistryRepository {
+public final class EtcdRepository implements GovernanceRepository {
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.RegistryRepository b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-etcd/src/main/resources/META-INF/services/org.apache.shardingsphere.gover [...]
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.RegistryRepository
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.GovernanceRepository
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 97c6069..e6fb22d 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository {
+public final class CuratorZookeeperRepository implements GovernanceRepository {
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.RegistryRepository b/shardingsphere-governance/shardingsphere-governance-repository/shardingsphere-governance-repository-provider/shardingsphere-governance-repository-zookeeper-curator/src/main/resources/META-INF/services/org.a [...]
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.RegistryRepository
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.GovernanceRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java
index 7f4e559..59df6bf 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java
@@ -75,7 +75,7 @@ public final class GovernanceShardingSphereDataSourceFactoryTest {
private GovernanceConfiguration createGovernanceConfiguration() {
GovernanceConfiguration result = mock(GovernanceConfiguration.class);
- when(result.getRegistryCenterConfiguration()).thenReturn(new GovernanceCenterConfiguration("REG_TEST", "", null));
+ when(result.getGovernanceCenterConfiguration()).thenReturn(new GovernanceCenterConfiguration("GOV_TEST", "", null));
return result;
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestGovernanceRepository.java
similarity index 92%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestGovernanceRepository.java
index 3b8caa7..1c55a89 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestGovernanceRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.governance.fixture;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 TestRegistryRepository implements RegistryRepository {
+public final class TestGovernanceRepository implements GovernanceRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
@@ -56,20 +56,20 @@ public final class TestRegistryRepository implements RegistryRepository {
}
@Override
- public boolean tryLock(final String key, final long time, final TimeUnit unit) {
- return false;
+ public void delete(final String key) {
}
@Override
- public void releaseLock(final String key) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
- public void delete(final String key) {
+ public boolean tryLock(final String key, final long time, final TimeUnit unit) {
+ return false;
}
@Override
- public void watch(final String key, final DataChangedEventListener listener) {
+ public void releaseLock(final String key) {
}
@Override
@@ -79,6 +79,6 @@ public final class TestRegistryRepository implements RegistryRepository {
@Override
public String getType() {
- return "REG_TEST";
+ return "GOV_TEST";
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
index 178244c..560b97a 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
@@ -76,7 +76,7 @@ public final class GovernanceShardingSphereDataSourceTest {
private static GovernanceCenterConfiguration getRegistryCenterConfiguration() {
Properties properties = new Properties();
properties.setProperty("overwrite", "true");
- return new GovernanceCenterConfiguration("REG_TEST", "localhost:3181", properties);
+ return new GovernanceCenterConfiguration("GOV_TEST", "localhost:3181", properties);
}
@Test
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
index d239c3d..4c26a30 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
@@ -32,7 +32,7 @@ public final class YamlInstanceConfigurationSwapperUtilTest {
@Test
public void marshal() {
YamlGovernanceConfiguration expected = createExpectedYamlGovernanceConfiguration();
- GovernanceCenterConfiguration actual = YamlGovernanceRepositoryConfigurationSwapperUtil.marshal(expected).getRegistryCenterConfiguration();
+ GovernanceCenterConfiguration actual = YamlGovernanceRepositoryConfigurationSwapperUtil.marshal(expected).getGovernanceCenterConfiguration();
assertThat(actual.getType(), is(expected.getRegistryCenter().getType()));
assertThat(actual.getServerLists(), is(expected.getRegistryCenter().getServerLists()));
assertThat(actual.getProps(), is(expected.getRegistryCenter().getProps()));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
similarity index 91%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
index abccbc5..f685925 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.governance.fixture.TestRegistryRepository
+org.apache.shardingsphere.driver.governance.fixture.TestGovernanceRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
index f47c464..43e4b07 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
@@ -50,7 +50,7 @@ rules:
governance:
name: test_rw_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
index e721a17..93ec3dd 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
@@ -50,7 +50,7 @@ rules:
governance:
name: test_rw_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index 2071902..23b16d8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -89,7 +89,7 @@ rules:
governance:
name: test_sharding_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index 2ac9d6d..ae5cca7 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -89,7 +89,7 @@ rules:
governance:
name: test_sharding_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index c06b6a7..ba77fee 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -71,7 +71,7 @@ rules:
governance:
name: test_sharding_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 42841af..c90ae70 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -73,7 +73,7 @@ rules:
governance:
name: test_sharding_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
index 1663e5c..16c3bf6 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
@@ -125,7 +125,7 @@ rules:
governance:
name: test_sharding_ms_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
index ed70f80..6100f91 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
@@ -127,7 +127,7 @@ rules:
governance:
name: test_sharding_ms_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
index c0c769c..6adcd6f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
@@ -48,7 +48,7 @@ dataSources:
governance:
name: test_sharding_ms_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
index eaffea1..93da5b8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
@@ -85,7 +85,7 @@ rules:
governance:
name: test_sharding_ms_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
index 084b1d6..cc2c6f4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
@@ -88,7 +88,7 @@ rules:
governance:
name: test_sharding_ms_registry_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
props:
retryIntervalMilliseconds: 10
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
index 02289d2..6f59955 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
@@ -18,7 +18,7 @@
governance:
name: test_name
registryCenter:
- type: REG_TEST
+ type: GOV_TEST
serverLists: localhost:3181
overwrite: true
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/TestGovernanceRepository.java
index 7189173..1cb458e 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/TestGovernanceRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.boot.governance.registry;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository {
+public final class TestGovernanceRepository implements GovernanceRepository {
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/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository 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.Governanc [...]
similarity index 100%
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.RegistryRepository
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.GovernanceRepository
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/TestGovernanceRepository.java
index e0b1cdf..e40a7e0 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/TestGovernanceRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.namespace.governance.registry;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 RegistryRepository {
+public final class TestGovernanceRepository implements GovernanceRepository {
@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 ef5ce16..c35df52 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="registryRepository" type="TestRegistry" server-lists="localhost:3181">
+ <governance:reg-center id="governanceRepository" 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="registryRepository" />
- <governance:data-source id="shardingRuleWithAttributesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="shardingRuleWithAttributesDataSourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="multiTableRulesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiTableRulesDataSourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="tableRuleWithAttributesDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="tableRuleWithAttributesDataSourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="bindingTableRuleDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="bindingTableRuleDatasourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="multiBindingTableRulesDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiBindingTableRulesDatasourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="broadcastTableRuleDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="broadcastTableRuleDatasourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="multiBroadcastTableRulesDatasourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="multiBroadcastTableRulesDatasourceShardingRule" reg-center-ref="registryRepository" />
- <governance:data-source id="propsDataSourceGovernance" data-source-names="dbtbl_0,dbtbl_1" rule-refs="propsDataSourceShardingRule" reg-center-ref="registryRepository">
+ <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">
<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.RegistryRepository 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.GovernanceRepository
similarity index 100%
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.RegistryRepository
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.GovernanceRepository
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureGovernanceRepository.java
similarity index 92%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java
rename to shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureGovernanceRepository.java
index 25a02a9..79e72e8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureGovernanceRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.fixture;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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 FixtureRegistryRepository implements RegistryRepository {
+public final class FixtureGovernanceRepository implements GovernanceRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
@@ -56,20 +56,20 @@ public final class FixtureRegistryRepository implements RegistryRepository {
}
@Override
- public boolean tryLock(final String key, final long time, final TimeUnit unit) {
- return false;
+ public void delete(final String key) {
}
@Override
- public void releaseLock(final String key) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
- public void delete(final String key) {
+ public boolean tryLock(final String key, final long time, final TimeUnit unit) {
+ return false;
}
@Override
- public void watch(final String key, final DataChangedEventListener listener) {
+ public void releaseLock(final String key) {
}
@Override
@@ -79,6 +79,6 @@ public final class FixtureRegistryRepository implements RegistryRepository {
@Override
public String getType() {
- return "REG_FIXTURE";
+ return "GOV_FIXTURE";
}
}
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 bc16b67..f67b61f 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.FixtureRegistryRepository;
+import org.apache.shardingsphere.proxy.fixture.FixtureGovernanceRepository;
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 FixtureRegistryRepository registryRepository = new FixtureRegistryRepository();
+ private final FixtureGovernanceRepository governanceRepository = new FixtureGovernanceRepository();
@Test
public void assertGetProxyConfiguration() throws IOException {
@@ -83,11 +83,11 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
private void initConfigCenter() {
RegistryCenterNode node = new RegistryCenterNode();
- registryRepository.persist(node.getUsersNode(), readYAML(USERS_YAML));
- registryRepository.persist(node.getPropsPath(), readYAML(PROPS_YAML));
- registryRepository.persist(node.getMetadataNodePath(), "db");
- registryRepository.persist(node.getMetadataDataSourcePath("db"), readYAML(DATA_SOURCE_YAML));
- registryRepository.persist(node.getRulePath("db"), readYAML(SHARDING_RULE_YAML));
+ 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));
}
@SneakyThrows({URISyntaxException.class, IOException.class})
@@ -96,7 +96,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
}
private void closeConfigCenter() {
- registryRepository.close();
+ governanceRepository.close();
}
@Test
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
similarity index 92%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository
rename to shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
index e634f1b..f76944f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.RegistryRepository
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.governance.repository.api.GovernanceRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.fixture.FixtureRegistryRepository
+org.apache.shardingsphere.proxy.fixture.FixtureGovernanceRepository
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
index 6bef22f..eb53eaf 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
@@ -18,7 +18,7 @@
governance:
name: governance_ds
registryCenter:
- type: REG_FIXTURE
+ type: GOV_FIXTURE
serverLists: localhost:2181
props:
retryIntervalMilliseconds: 500
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
index eae6868..3b28b93 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
@@ -18,7 +18,7 @@
governance:
name: governance_ds
registryCenter:
- type: REG_FIXTURE
+ type: GOV_FIXTURE
serverLists: localhost:2181
props:
retryIntervalMilliseconds: 500
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/RegistryRepositoryAPI.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/GovernanceRepositoryAPI.java
similarity index 96%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/RegistryRepositoryAPI.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/GovernanceRepositoryAPI.java
index fba1e01..f75cc39 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/RegistryRepositoryAPI.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/GovernanceRepositoryAPI.java
@@ -24,9 +24,9 @@ import org.apache.shardingsphere.scaling.core.job.progress.JobProgress;
import java.util.List;
/**
- * Registry repository API.
+ * Governance repository API.
*/
-public interface RegistryRepositoryAPI {
+public interface GovernanceRepositoryAPI {
/**
* persist job progress.
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 f77bc4d..4a9f410 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,12 +29,12 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
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;
-import org.apache.shardingsphere.scaling.core.api.impl.RegistryRepositoryAPIImpl;
+import org.apache.shardingsphere.scaling.core.api.impl.GovernanceRepositoryAPIImpl;
import org.apache.shardingsphere.scaling.core.api.impl.ScalingAPIImpl;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.config.ScalingContext;
@@ -58,12 +58,12 @@ public final class ScalingAPIFactory {
}
/**
- * Get registry repository API.
+ * Get governance repository API.
*
- * @return registry repository API
+ * @return governance repository API
*/
- public static RegistryRepositoryAPI getRegistryRepositoryAPI() {
- return RegistryRepositoryAPIHolder.getInstance();
+ public static GovernanceRepositoryAPI getGovernanceRepositoryAPI() {
+ return GovernanceRepositoryAPIHolder.getInstance();
}
/**
@@ -125,32 +125,32 @@ public final class ScalingAPIFactory {
}
}
- private static final class RegistryRepositoryAPIHolder {
+ private static final class GovernanceRepositoryAPIHolder {
- private static volatile RegistryRepositoryAPI instance;
+ private static volatile GovernanceRepositoryAPI instance;
static {
- ShardingSphereServiceLoader.register(RegistryRepository.class);
+ ShardingSphereServiceLoader.register(GovernanceRepository.class);
}
- public static RegistryRepositoryAPI getInstance() {
+ public static GovernanceRepositoryAPI getInstance() {
if (null == instance) {
synchronized (ScalingAPIFactory.class) {
if (null == instance) {
- instance = createRegistryRepositoryAPI();
+ instance = createGovernanceRepositoryAPI();
}
}
}
return instance;
}
- private static RegistryRepositoryAPI createRegistryRepositoryAPI() {
+ private static GovernanceRepositoryAPI createGovernanceRepositoryAPI() {
checkServerConfig();
GovernanceConfiguration governanceConfig = ScalingContext.getInstance().getServerConfig().getGovernanceConfig();
- GovernanceCenterConfiguration registryCenterConfig = governanceConfig.getRegistryCenterConfiguration();
- RegistryRepository registryRepository = TypedSPIRegistry.getRegisteredService(RegistryRepository.class, registryCenterConfig.getType(), registryCenterConfig.getProps());
- registryRepository.init(governanceConfig.getName(), registryCenterConfig);
- return new RegistryRepositoryAPIImpl(registryRepository);
+ GovernanceCenterConfiguration registryCenterConfig = governanceConfig.getGovernanceCenterConfiguration();
+ GovernanceRepository governanceRepository = TypedSPIRegistry.getRegisteredService(GovernanceRepository.class, registryCenterConfig.getType(), registryCenterConfig.getProps());
+ governanceRepository.init(governanceConfig.getName(), registryCenterConfig);
+ return new GovernanceRepositoryAPIImpl(governanceRepository);
}
}
@@ -169,9 +169,9 @@ public final class ScalingAPIFactory {
checkServerConfig();
GovernanceConfiguration governanceConfig = ScalingContext.getInstance().getServerConfig().getGovernanceConfig();
String namespace = governanceConfig.getName() + ScalingConstant.SCALING_ROOT;
- jobStatisticsAPI = JobAPIFactory.createJobStatisticsAPI(governanceConfig.getRegistryCenterConfiguration().getServerLists(), namespace, null);
- jobConfigurationAPI = JobAPIFactory.createJobConfigurationAPI(governanceConfig.getRegistryCenterConfiguration().getServerLists(), namespace, null);
- jobOperateAPI = JobAPIFactory.createJobOperateAPI(governanceConfig.getRegistryCenterConfiguration().getServerLists(), namespace, null);
+ jobStatisticsAPI = JobAPIFactory.createJobStatisticsAPI(governanceConfig.getGovernanceCenterConfiguration().getServerLists(), namespace, null);
+ jobConfigurationAPI = JobAPIFactory.createJobConfigurationAPI(governanceConfig.getGovernanceCenterConfiguration().getServerLists(), namespace, null);
+ jobOperateAPI = JobAPIFactory.createJobOperateAPI(governanceConfig.getGovernanceCenterConfiguration().getServerLists(), namespace, null);
}
public static ElasticJobAPIHolder getInstance() {
@@ -210,9 +210,9 @@ public final class ScalingAPIFactory {
private static ZookeeperConfiguration getZookeeperConfig() {
checkServerConfig();
GovernanceConfiguration governanceConfig = ScalingContext.getInstance().getServerConfig().getGovernanceConfig();
- ZookeeperConfiguration result = new ZookeeperConfiguration(governanceConfig.getRegistryCenterConfiguration().getServerLists(),
+ ZookeeperConfiguration result = new ZookeeperConfiguration(governanceConfig.getGovernanceCenterConfiguration().getServerLists(),
governanceConfig.getName() + ScalingConstant.SCALING_ROOT);
- Properties props = governanceConfig.getRegistryCenterConfiguration().getProps();
+ Properties props = governanceConfig.getGovernanceCenterConfiguration().getProps();
result.setMaxSleepTimeMilliseconds(getProperty(props, "max.sleep.time.milliseconds", result.getMaxSleepTimeMilliseconds()));
result.setBaseSleepTimeMilliseconds(getProperty(props, "base.sleep.time.milliseconds", result.getBaseSleepTimeMilliseconds()));
result.setConnectionTimeoutMilliseconds(getProperty(props, "connection.timeout.milliseconds", result.getConnectionTimeoutMilliseconds()));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/RegistryRepositoryAPIImpl.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java
similarity index 81%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/RegistryRepositoryAPIImpl.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java
index ec86a13..df0d7e9 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/RegistryRepositoryAPIImpl.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImpl.java
@@ -20,9 +20,9 @@ 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.RegistryRepository;
+import org.apache.shardingsphere.governance.repository.api.GovernanceRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
+import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.job.JobContext;
import org.apache.shardingsphere.scaling.core.job.progress.JobProgress;
@@ -36,13 +36,13 @@ import java.util.List;
import java.util.Map;
/**
- * Registry repository API impl.
+ * Governance repository API impl.
*/
@RequiredArgsConstructor
@Slf4j
-public final class RegistryRepositoryAPIImpl implements RegistryRepositoryAPI {
+public final class GovernanceRepositoryAPIImpl implements GovernanceRepositoryAPI {
- private final RegistryRepository registryRepository;
+ private final GovernanceRepository repository;
@Override
public void persistJobProgress(final JobContext jobContext) {
@@ -51,7 +51,7 @@ public final class RegistryRepositoryAPIImpl implements RegistryRepositoryAPI {
jobProgress.setDatabaseType(jobContext.getJobConfig().getHandleConfig().getDatabaseType());
jobProgress.setIncrementalTaskProgressMap(getIncrementalTaskProgressMap(jobContext));
jobProgress.setInventoryTaskProgressMap(getInventoryTaskProgressMap(jobContext));
- registryRepository.persist(getOffsetPath(jobContext.getJobId(), jobContext.getShardingItem()), jobProgress.toString());
+ repository.persist(getOffsetPath(jobContext.getJobId(), jobContext.getShardingItem()), jobProgress.toString());
}
private Map<String, IncrementalTaskProgress> getIncrementalTaskProgressMap(final JobContext jobContext) {
@@ -72,35 +72,35 @@ public final class RegistryRepositoryAPIImpl implements RegistryRepositoryAPI {
@Override
public JobProgress getJobProgress(final long jobId, final int shardingItem) {
- String data = registryRepository.get(getOffsetPath(jobId, shardingItem));
+ String data = repository.get(getOffsetPath(jobId, shardingItem));
return Strings.isNullOrEmpty(data) ? null : JobProgress.init(data);
}
@Override
public void deleteJobProgress(final long jobId) {
log.info("delete job progress {}", jobId);
- registryRepository.delete(String.format("%s/%d/offset", ScalingConstant.SCALING_ROOT, jobId));
+ repository.delete(String.format("%s/%d/offset", ScalingConstant.SCALING_ROOT, jobId));
}
@Override
public void deleteJob(final long jobId) {
log.info("delete job {}", jobId);
- registryRepository.delete(String.format("%s/%d", ScalingConstant.SCALING_ROOT, jobId));
+ repository.delete(String.format("%s/%d", ScalingConstant.SCALING_ROOT, jobId));
}
@Override
public List<String> getChildrenKeys(final String key) {
- return registryRepository.getChildrenKeys(key);
+ return repository.getChildrenKeys(key);
}
@Override
public void watch(final String key, final DataChangedEventListener listener) {
- registryRepository.watch(key, listener);
+ repository.watch(key, listener);
}
@Override
public void persist(final String key, final String value) {
- registryRepository.persist(key, value);
+ repository.persist(key, value);
}
private String getOffsetPath(final long jobId, final int shardingItem) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
index 355d11a..7f85ed2 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
@@ -87,8 +87,8 @@ public final class ScalingAPIImpl implements ScalingAPI {
return Optional.empty();
}
log.info("Start scaling job by {}", YamlEngine.marshal(jobConfig));
- ScalingAPIFactory.getRegistryRepositoryAPI().persist(String.format("%s/%d", ScalingConstant.SCALING_ROOT, jobConfig.getHandleConfig().getJobId()), ScalingJob.class.getCanonicalName());
- ScalingAPIFactory.getRegistryRepositoryAPI().persist(String.format("%s/%d/config", ScalingConstant.SCALING_ROOT, jobConfig.getHandleConfig().getJobId()), createJobConfig(jobConfig));
+ ScalingAPIFactory.getGovernanceRepositoryAPI().persist(String.format("%s/%d", ScalingConstant.SCALING_ROOT, jobConfig.getHandleConfig().getJobId()), ScalingJob.class.getCanonicalName());
+ ScalingAPIFactory.getGovernanceRepositoryAPI().persist(String.format("%s/%d/config", ScalingConstant.SCALING_ROOT, jobConfig.getHandleConfig().getJobId()), createJobConfig(jobConfig));
return Optional.of(jobConfig.getHandleConfig().getJobId());
}
@@ -114,13 +114,13 @@ public final class ScalingAPIImpl implements ScalingAPI {
public void remove(final long jobId) {
log.info("Remove scaling job {}", jobId);
ScalingAPIFactory.getJobOperateAPI().remove(String.valueOf(jobId), null);
- ScalingAPIFactory.getRegistryRepositoryAPI().deleteJob(jobId);
+ ScalingAPIFactory.getGovernanceRepositoryAPI().deleteJob(jobId);
}
@Override
public Map<Integer, JobProgress> getProgress(final long jobId) {
return IntStream.range(0, getJobConfig(jobId).getHandleConfig().getShardingTotalCount()).boxed()
- .collect(LinkedHashMap::new, (map, each) -> map.put(each, ScalingAPIFactory.getRegistryRepositoryAPI().getJobProgress(jobId, each)), LinkedHashMap::putAll);
+ .collect(LinkedHashMap::new, (map, each) -> map.put(each, ScalingAPIFactory.getGovernanceRepositoryAPI().getJobProgress(jobId, each)), LinkedHashMap::putAll);
}
@Override
@@ -138,7 +138,7 @@ public final class ScalingAPIImpl implements ScalingAPI {
@Override
public void reset(final long jobId) throws SQLException {
log.info("Scaling job {} reset target table", jobId);
- ScalingAPIFactory.getRegistryRepositoryAPI().deleteJobProgress(jobId);
+ ScalingAPIFactory.getGovernanceRepositoryAPI().deleteJobProgress(jobId);
new ScalingEnvironmentManager().resetTargetTable(new JobContext(getJobConfig(jobId)));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java
index 514680a..8ce293e 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/executor/job/ScalingJobExecutor.java
@@ -47,11 +47,11 @@ public final class ScalingJobExecutor extends AbstractScalingExecutor {
public void start() {
super.start();
log.info("Start scaling job executor.");
- watchRegistryRepositoryConfig();
+ watchGovernanceRepositoryConfiguration();
}
- private void watchRegistryRepositoryConfig() {
- ScalingAPIFactory.getRegistryRepositoryAPI().watch(ScalingConstant.SCALING_ROOT, event -> {
+ private void watchGovernanceRepositoryConfiguration() {
+ ScalingAPIFactory.getGovernanceRepositoryAPI().watch(ScalingConstant.SCALING_ROOT, event -> {
Optional<JobConfigurationPOJO> jobConfigPOJOOptional = getJobConfigPOJO(event);
if (!jobConfigPOJOOptional.isPresent()) {
return;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java
index 05469c1..0b42f50 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJob.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.elasticjob.api.ShardingContext;
import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
import org.apache.shardingsphere.governance.core.registry.listener.event.rule.SwitchRuleConfigurationEvent;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
-import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
+import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPIFactory;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
@@ -39,11 +39,11 @@ public final class FinishedCheckJob implements SimpleJob {
private final ScalingAPI scalingAPI = ScalingAPIFactory.getScalingAPI();
- private final RegistryRepositoryAPI registryRepositoryAPI = ScalingAPIFactory.getRegistryRepositoryAPI();
+ private final GovernanceRepositoryAPI governanceRepositoryAPI = ScalingAPIFactory.getGovernanceRepositoryAPI();
@Override
public void execute(final ShardingContext shardingContext) {
- registryRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT).stream()
+ governanceRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT).stream()
.filter(each -> !each.startsWith("_"))
.forEach(each -> {
long jobId = Long.parseLong(each);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ScalingJob.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ScalingJob.java
index 661ef20..02e8891 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ScalingJob.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ScalingJob.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.api.ShardingContext;
import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
-import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
+import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPIFactory;
import org.apache.shardingsphere.scaling.core.config.JobConfiguration;
import org.apache.shardingsphere.scaling.core.job.preparer.ScalingJobPreparer;
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.scaling.core.job.schedule.JobSchedulerCenter;
@Slf4j
public final class ScalingJob implements SimpleJob {
- private final RegistryRepositoryAPI registryRepositoryAPI = ScalingAPIFactory.getRegistryRepositoryAPI();
+ private final GovernanceRepositoryAPI governanceRepositoryAPI = ScalingAPIFactory.getGovernanceRepositoryAPI();
private final ScalingJobPreparer jobPreparer = new ScalingJobPreparer();
@@ -43,9 +43,9 @@ public final class ScalingJob implements SimpleJob {
JobConfiguration jobConfig = YamlEngine.unmarshal(shardingContext.getJobParameter(), JobConfiguration.class);
jobConfig.getHandleConfig().setShardingItem(shardingContext.getShardingItem());
JobContext jobContext = new JobContext(jobConfig);
- jobContext.setInitProgress(registryRepositoryAPI.getJobProgress(jobContext.getJobId(), jobContext.getShardingItem()));
+ jobContext.setInitProgress(governanceRepositoryAPI.getJobProgress(jobContext.getJobId(), jobContext.getShardingItem()));
jobPreparer.prepare(jobContext);
- registryRepositoryAPI.persistJobProgress(jobContext);
+ governanceRepositoryAPI.persistJobProgress(jobContext);
JobSchedulerCenter.start(jobContext);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java
index 42052fb..88fff36a 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/schedule/JobSchedulerCenter.java
@@ -22,7 +22,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorThreadFactoryBuilder;
-import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
+import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPIFactory;
import org.apache.shardingsphere.scaling.core.job.JobContext;
@@ -44,7 +44,7 @@ public final class JobSchedulerCenter {
private static final ScheduledExecutorService JOB_PERSIST_EXECUTOR = Executors.newSingleThreadScheduledExecutor(ExecutorThreadFactoryBuilder.build("scaling-job-persist-%d"));
- private static final RegistryRepositoryAPI REGISTRY_REPOSITORY_API = ScalingAPIFactory.getRegistryRepositoryAPI();
+ private static final GovernanceRepositoryAPI REGISTRY_REPOSITORY_API = ScalingAPIFactory.getGovernanceRepositoryAPI();
static {
JOB_PERSIST_EXECUTOR.scheduleWithFixedDelay(new PersistJobContextRunnable(), 1, 1, TimeUnit.MINUTES);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/RegistryRepositoryAPIImplTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImplTest.java
similarity index 85%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/RegistryRepositoryAPIImplTest.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImplTest.java
index 7d22321..00da777 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/RegistryRepositoryAPIImplTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/api/impl/GovernanceRepositoryAPIImplTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.api.impl;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
-import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
+import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPIFactory;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.config.DumperConfiguration;
@@ -48,37 +48,37 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-public final class RegistryRepositoryAPIImplTest {
+public final class GovernanceRepositoryAPIImplTest {
- private static RegistryRepositoryAPI registryRepositoryAPI;
+ private static GovernanceRepositoryAPI governanceRepositoryAPI;
@BeforeClass
public static void beforeClass() throws Exception {
EmbedTestingServer.start();
ReflectionUtil.setFieldValue(ScalingContext.getInstance(), "serverConfig", mockServerConfig());
- registryRepositoryAPI = ScalingAPIFactory.getRegistryRepositoryAPI();
+ governanceRepositoryAPI = ScalingAPIFactory.getGovernanceRepositoryAPI();
}
@Test
public void assertPersistJobProgress() {
JobContext jobContext = mockJobContext();
- registryRepositoryAPI.persistJobProgress(jobContext);
- JobProgress actual = registryRepositoryAPI.getJobProgress(jobContext.getJobId(), jobContext.getShardingItem());
+ governanceRepositoryAPI.persistJobProgress(jobContext);
+ JobProgress actual = governanceRepositoryAPI.getJobProgress(jobContext.getJobId(), jobContext.getShardingItem());
assertThat(actual.toString(), is(mockYamlJobProgress()));
}
@Test
public void assertDeleteJob() {
- registryRepositoryAPI.persist(ScalingConstant.SCALING_ROOT + "/1", "");
- registryRepositoryAPI.deleteJob(1L);
- JobProgress actual = registryRepositoryAPI.getJobProgress(0L, 0);
+ governanceRepositoryAPI.persist(ScalingConstant.SCALING_ROOT + "/1", "");
+ governanceRepositoryAPI.deleteJob(1L);
+ JobProgress actual = governanceRepositoryAPI.getJobProgress(0L, 0);
assertNull(actual);
}
@Test
public void assertGetChildrenKeys() {
- registryRepositoryAPI.persist(ScalingConstant.SCALING_ROOT + "/1", "");
- List<String> actual = registryRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT);
+ governanceRepositoryAPI.persist(ScalingConstant.SCALING_ROOT + "/1", "");
+ List<String> actual = governanceRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT);
assertFalse(actual.isEmpty());
}
@@ -86,8 +86,8 @@ public final class RegistryRepositoryAPIImplTest {
public void assertWatch() throws InterruptedException {
CountDownLatch countDownLatch = new CountDownLatch(1);
String key = ScalingConstant.SCALING_ROOT + "/1";
- registryRepositoryAPI.persist(key, "");
- registryRepositoryAPI.watch(ScalingConstant.SCALING_ROOT, event -> {
+ governanceRepositoryAPI.persist(key, "");
+ governanceRepositoryAPI.watch(ScalingConstant.SCALING_ROOT, event -> {
if (event.getKey().equals(key)) {
assertThat(event.getType(), is(DataChangedEvent.Type.ADDED));
countDownLatch.countDown();
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java
index 799ff5a..649a93f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/FinishedCheckJobTest.java
@@ -22,7 +22,7 @@ import com.google.common.collect.Maps;
import lombok.SneakyThrows;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
-import org.apache.shardingsphere.scaling.core.api.RegistryRepositoryAPI;
+import org.apache.shardingsphere.scaling.core.api.GovernanceRepositoryAPI;
import org.apache.shardingsphere.scaling.core.api.ScalingAPI;
import org.apache.shardingsphere.scaling.core.common.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.config.JobConfiguration;
@@ -56,7 +56,7 @@ public final class FinishedCheckJobTest {
private ScalingAPI scalingAPI;
@Mock
- private RegistryRepositoryAPI registryRepositoryAPI;
+ private GovernanceRepositoryAPI governanceRepositoryAPI;
@BeforeClass
public static void beforeClass() throws Exception {
@@ -69,12 +69,12 @@ public final class FinishedCheckJobTest {
@SneakyThrows(ReflectiveOperationException.class)
public void setUp() {
ReflectionUtil.setFieldValue(finishedCheckJob, "scalingAPI", scalingAPI);
- ReflectionUtil.setFieldValue(finishedCheckJob, "registryRepositoryAPI", registryRepositoryAPI);
+ ReflectionUtil.setFieldValue(finishedCheckJob, "governanceRepositoryAPI", governanceRepositoryAPI);
}
@Test
public void assertExecuteWithoutWorkflow() {
- when(registryRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT)).thenReturn(Lists.newArrayList("1"));
+ when(governanceRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT)).thenReturn(Lists.newArrayList("1"));
when(scalingAPI.getJobConfig(1L)).thenReturn(new JobConfiguration());
finishedCheckJob.execute(null);
verify(scalingAPI, never()).getProgress(1L);
@@ -82,7 +82,7 @@ public final class FinishedCheckJobTest {
@Test
public void assertExecuteWithWorkflow() {
- when(registryRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT)).thenReturn(Lists.newArrayList("1"));
+ when(governanceRepositoryAPI.getChildrenKeys(ScalingConstant.SCALING_ROOT)).thenReturn(Lists.newArrayList("1"));
when(scalingAPI.getJobConfig(1L)).thenReturn(mockJobConfigWithWorkflow());
when(scalingAPI.getProgress(1L)).thenReturn(Maps.newHashMap());
when(scalingAPI.dataConsistencyCheck(1L)).thenReturn(mockDataConsistencyCheck());