This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 ff4b505 Refactor gov.registry.node package (#10622)
ff4b505 is described below
commit ff4b5052f1a373c2168a2ebd624c2eb09e2f9529
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 2 17:44:16 2021 +0800
Refactor gov.registry.node package (#10622)
* Move GovernanceInstance
* Move gov.core.schema package
* Move config node
* Refactor node package
* Refactor node package
---
.../context/authority/listener/PrivilegeNodeChangedWatcher.java | 2 +-
.../governance/context/metadata/GovernanceMetaDataContexts.java | 2 +-
.../context/metadata/GovernanceMetaDataContextsTest.java | 2 +-
.../core/{registry/instance => }/GovernanceInstance.java | 2 +-
.../governance/core/lock/service/LockRegistryService.java | 4 ++--
.../shardingsphere/governance/core/registry/RegistryCenter.java | 8 ++++----
.../governance/core/registry/cache/RegistryCacheManager.java | 1 +
.../core/registry/cache/{ => event}/StartScalingEvent.java | 2 +-
.../governance/core/registry/cache/{ => node}/CacheNode.java | 2 +-
.../cache/{ => subscriber}/ScalingRegistrySubscriber.java | 6 ++++--
.../core/registry/config/{service => }/node/GlobalNode.java | 2 +-
.../registry/config/{service => }/node/SchemaMetadataNode.java | 2 +-
.../registry/config/service/impl/DataSourceRegistryService.java | 2 +-
.../registry/config/service/impl/GlobalRuleRegistryService.java | 4 ++--
.../registry/config/service/impl/PropertiesRegistryService.java | 2 +-
.../registry/config/service/impl/SchemaRuleRegistryService.java | 2 +-
.../core/registry/config/watcher/GlobalRuleChangedWatcher.java | 2 +-
.../core/registry/config/watcher/PropertiesChangedWatcher.java | 2 +-
.../core/registry/metadata/service/SchemaRegistryService.java | 2 +-
.../core/registry/metadata/watcher/MetaDataChangedWatcher.java | 4 ++--
.../core/registry/process/{service => node}/ProcessNode.java | 2 +-
.../{service => subscriber}/ProcessRegistrySubscriber.java | 3 ++-
.../core/registry/state/event/DisabledStateChangedEvent.java | 2 +-
.../core/registry/state/event/PrimaryStateChangedEvent.java | 2 +-
.../core/registry/state/{service => node}/StatesNode.java | 4 ++--
.../registry/state/service/DataSourceStatusRegistryService.java | 1 +
.../registry/state/watcher/DataSourceStateChangedWatcher.java | 2 +-
.../core/registry/state/watcher/TerminalStateChangedWatcher.java | 4 ++--
.../governance/core/{registry => }/schema/GovernanceSchema.java | 2 +-
.../core/{registry => }/schema/GovernanceSchemaGroup.java | 2 +-
.../core/{registry/instance => }/GovernanceInstanceTest.java | 2 +-
.../cache/{ => subscriber}/ScalingRegistrySubscriberTest.java | 3 ++-
.../core/registry/config/{service => }/node/GlobalNodeTest.java | 2 +-
.../config/{service => }/node/SchemaMetadataNodeTest.java | 2 +-
.../core/registry/state/{service => node}/StatesNodeTest.java | 4 ++--
.../state/service/DataSourceStatusRegistryServiceTest.java | 1 +
.../registry/state/watcher/DataSourceStateChangedWatcherTest.java | 2 +-
.../core/{registry => }/schema/GovernanceSchemaGroupTest.java | 2 +-
.../core/{registry => }/schema/GovernanceSchemaTest.java | 2 +-
.../datasource/GovernanceShardingSphereDataSourceTest.java | 5 +++--
.../initializer/impl/GovernanceBootstrapInitializerTest.java | 4 ++--
.../org/apache/shardingsphere/scaling/core/api/ScalingWorker.java | 2 +-
42 files changed, 59 insertions(+), 51 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedWatcher.java
index 652a885..0eba29a 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/listener/PrivilegeNodeChangedWatcher.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.context.authority.listener;
import
org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.state.service.StatesNode;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index 176e2e4..be88a95 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration
import
org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.GovernanceFacade;
import
org.apache.shardingsphere.governance.core.lock.ShardingSphereDistributeLock;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceChangeCompletedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.MetaDataChangedEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
index 4d5b036..2014625 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration
import
org.apache.shardingsphere.governance.context.authority.listener.event.AuthorityChangedEvent;
import org.apache.shardingsphere.governance.core.GovernanceFacade;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaAddedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaDeletedEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/GovernanceInstance.java
similarity index 95%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/GovernanceInstance.java
index 3e6127e..5ad364c 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/GovernanceInstance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.instance;
+package org.apache.shardingsphere.governance.core;
import lombok.Getter;
import org.apache.shardingsphere.governance.core.utils.IpUtils;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/service/LockRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/service/LockRegistryService.java
index 25edd6b..2c97895 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/service/LockRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/service/LockRegistryService.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.governance.core.lock.service;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
-import
org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
-import
org.apache.shardingsphere.governance.core.registry.state.service.StatesNode;
+import org.apache.shardingsphere.governance.core.GovernanceInstance;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import java.util.Collection;
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 b3e929d..2df2f9c 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
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.governance.core.registry;
import lombok.Getter;
import
org.apache.shardingsphere.governance.core.lock.service.LockRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.cache.ScalingRegistrySubscriber;
-import
org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
+import
org.apache.shardingsphere.governance.core.registry.cache.subscriber.ScalingRegistrySubscriber;
+import org.apache.shardingsphere.governance.core.GovernanceInstance;
import
org.apache.shardingsphere.governance.core.registry.config.service.impl.DataSourceRegistryService;
import
org.apache.shardingsphere.governance.core.registry.config.service.impl.GlobalRuleRegistryService;
import
org.apache.shardingsphere.governance.core.registry.config.service.impl.PropertiesRegistryService;
import
org.apache.shardingsphere.governance.core.registry.config.service.impl.SchemaRuleRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.process.service.ProcessRegistrySubscriber;
+import
org.apache.shardingsphere.governance.core.registry.process.subscriber.ProcessRegistrySubscriber;
import
org.apache.shardingsphere.governance.core.registry.metadata.service.SchemaRegistryService;
import
org.apache.shardingsphere.governance.core.registry.state.service.DataSourceStatusRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.state.service.StatesNode;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/RegistryCacheManager.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/RegistryCacheManager.java
index c1bdadb..984553c 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/RegistryCacheManager.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/RegistryCacheManager.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.governance.core.registry.cache;
import com.google.common.base.Joiner;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.governance.core.registry.cache.node.CacheNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import java.util.UUID;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/StartScalingEvent.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/event/StartScalingEvent.java
similarity index 99%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/StartScalingEvent.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/event/StartScalingEvent.java
index e7d410e..dc3bdf7 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/StartScalingEvent.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/event/StartScalingEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.cache;
+package org.apache.shardingsphere.governance.core.registry.cache.event;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/CacheNode.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/node/CacheNode.java
similarity index 99%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/CacheNode.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/node/CacheNode.java
index 1da73e9..6a83a2f 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/CacheNode.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/node/CacheNode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.cache;
+package org.apache.shardingsphere.governance.core.registry.cache.node;
import com.google.common.base.Joiner;
import lombok.AccessLevel;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/ScalingRegistrySubscriber.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/subscriber/ScalingRegistrySubscriber.java
similarity index 94%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/ScalingRegistrySubscriber.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/subscriber/ScalingRegistrySubscriber.java
index 520b290..c71b3e3 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/ScalingRegistrySubscriber.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/cache/subscriber/ScalingRegistrySubscriber.java
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.cache;
+package org.apache.shardingsphere.governance.core.registry.cache.subscriber;
import com.google.common.eventbus.Subscribe;
+import
org.apache.shardingsphere.governance.core.registry.cache.RegistryCacheManager;
+import
org.apache.shardingsphere.governance.core.registry.cache.event.StartScalingEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationCachedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.SwitchRuleConfigurationEvent;
import
org.apache.shardingsphere.governance.core.registry.config.service.impl.SchemaRuleRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.SchemaMetadataNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.SchemaMetadataNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/node/GlobalNode.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/node/GlobalNode.java
similarity index 98%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/node/GlobalNode.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/node/GlobalNode.java
index bfed0c2..2936f96 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/node/GlobalNode.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/node/GlobalNode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.config.service.node;
+package org.apache.shardingsphere.governance.core.registry.config.node;
import com.google.common.base.Joiner;
import lombok.AccessLevel;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/node/SchemaMetadataNode.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/node/SchemaMetadataNode.java
similarity index 99%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/node/SchemaMetadataNode.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/node/SchemaMetadataNode.java
index 0fc406d..4e4007b 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/node/SchemaMetadataNode.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/node/SchemaMetadataNode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.config.service.node;
+package org.apache.shardingsphere.governance.core.registry.config.node;
import com.google.common.base.Joiner;
import lombok.AccessLevel;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/DataSourceRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/DataSourceRegistryService.java
index 6ba6515..68b146f 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/DataSourceRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/DataSourceRegistryService.java
@@ -22,7 +22,7 @@ import com.google.common.eventbus.Subscribe;
import
org.apache.shardingsphere.governance.core.registry.config.service.SchemaBasedRegistryService;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAddedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.SchemaMetadataNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.SchemaMetadataNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/GlobalRuleRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/GlobalRuleRegistryService.java
index 9ba295e..4999787 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/GlobalRuleRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/GlobalRuleRegistryService.java
@@ -22,8 +22,8 @@ import com.google.common.base.Strings;
import com.google.common.eventbus.Subscribe;
import
org.apache.shardingsphere.authority.api.config.AuthorityRuleConfiguration;
import
org.apache.shardingsphere.governance.core.registry.config.service.GlobalRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.GlobalNode;
-import
org.apache.shardingsphere.governance.core.registry.state.service.StatesNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.GlobalNode;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.metadata.mapper.event.dcl.impl.CreateUserStatementEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/PropertiesRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/PropertiesRegistryService.java
index c990915..4cef83d 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/PropertiesRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/PropertiesRegistryService.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.governance.core.registry.config.service.impl;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.governance.core.registry.config.service.GlobalRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.GlobalNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.GlobalNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/SchemaRuleRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/SchemaRuleRegistryService.java
index 57a9061..9ffde4b 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/SchemaRuleRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/service/impl/SchemaRuleRegistryService.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.governance.core.registry.config.service.impl;
import com.google.common.base.Strings;
import com.google.common.eventbus.Subscribe;
import
org.apache.shardingsphere.governance.core.registry.config.service.SchemaBasedRegistryService;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.SchemaMetadataNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.SchemaMetadataNode;
import
org.apache.shardingsphere.infra.rule.checker.RuleConfigurationCheckerFactory;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsAlteredEvent;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/GlobalRuleChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/GlobalRuleChangedWatcher.java
index 2ed6fd6..8af289f 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/GlobalRuleChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/GlobalRuleChangedWatcher.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.config.watcher;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.GlobalNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.GlobalNode;
import org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.GlobalRuleConfigurationsChangedEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/PropertiesChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/PropertiesChangedWatcher.java
index c1266ba..30d3fbd 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/PropertiesChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/config/watcher/PropertiesChangedWatcher.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.registry.config.watcher;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.GlobalNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.GlobalNode;
import org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
import
org.apache.shardingsphere.governance.core.registry.config.event.props.PropertiesChangedEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/service/SchemaRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/service/SchemaRegistryService.java
index 5e06161..f2feee1 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/service/SchemaRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/service/SchemaRegistryService.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
import com.google.common.eventbus.Subscribe;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.MetaDataCreatedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.MetaDataDroppedEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.SchemaMetadataNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.SchemaMetadataNode;
import org.apache.shardingsphere.governance.core.yaml.schema.pojo.YamlSchema;
import
org.apache.shardingsphere.governance.core.yaml.schema.swapper.SchemaYamlSwapper;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
index d4fd945..7cd2034 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -20,12 +20,12 @@ package
org.apache.shardingsphere.governance.core.registry.metadata.watcher;
import com.google.common.base.Strings;
import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
import org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
-import org.apache.shardingsphere.governance.core.registry.cache.CacheNode;
+import org.apache.shardingsphere.governance.core.registry.cache.node.CacheNode;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationCachedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.RuleConfigurationsChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.schema.SchemaChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.SchemaMetadataNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.SchemaMetadataNode;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaAddedEvent;
import
org.apache.shardingsphere.governance.core.registry.metadata.event.SchemaDeletedEvent;
import org.apache.shardingsphere.governance.core.yaml.schema.pojo.YamlSchema;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/service/ProcessNode.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/node/ProcessNode.java
similarity index 99%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/service/ProcessNode.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/node/ProcessNode.java
index 57704ab..40ce118 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/service/ProcessNode.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/node/ProcessNode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.process.service;
+package org.apache.shardingsphere.governance.core.registry.process.node;
import com.google.common.base.Joiner;
import lombok.AccessLevel;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/service/ProcessRegistrySubscriber.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/subscriber/ProcessRegistrySubscriber.java
similarity index 98%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/service/ProcessRegistrySubscriber.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/subscriber/ProcessRegistrySubscriber.java
index c071a23..71379a7 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/service/ProcessRegistrySubscriber.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/process/subscriber/ProcessRegistrySubscriber.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.process.service;
+package org.apache.shardingsphere.governance.core.registry.process.subscriber;
import com.google.common.eventbus.Subscribe;
import
org.apache.shardingsphere.governance.core.registry.process.event.ExecuteProcessReportEvent;
@@ -23,6 +23,7 @@ import
org.apache.shardingsphere.governance.core.registry.process.event.ExecuteP
import
org.apache.shardingsphere.governance.core.registry.process.event.ExecuteProcessUnitReportEvent;
import
org.apache.shardingsphere.governance.core.registry.process.event.ShowProcessListRequestEvent;
import
org.apache.shardingsphere.governance.core.registry.process.event.ShowProcessListResponseEvent;
+import
org.apache.shardingsphere.governance.core.registry.process.node.ProcessNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessConstants;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/DisabledStateChangedEvent.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/DisabledStateChangedEvent.java
index 531d717..395b751 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/DisabledStateChangedEvent.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/DisabledStateChangedEvent.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.governance.core.registry.state.event;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
/**
* Disabled state event.
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/PrimaryStateChangedEvent.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/PrimaryStateChangedEvent.java
index a3a6991..4c2b122 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/PrimaryStateChangedEvent.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/event/PrimaryStateChangedEvent.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.governance.core.registry.state.event;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
/**
* Primary state event.
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/StatesNode.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/node/StatesNode.java
similarity index 98%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/StatesNode.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/node/StatesNode.java
index d841a19..695416d 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/StatesNode.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/node/StatesNode.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.state.service;
+package org.apache.shardingsphere.governance.core.registry.state.node;
import com.google.common.base.Joiner;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryService.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryService.java
index 6f68952..2e228cd 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryService.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryService.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.governance.core.registry.state.service;
import com.google.common.base.Strings;
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.governance.core.registry.state.ResourceState;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.rule.event.impl.DataSourceDisabledEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcher.java
index 41d7e4c..9559276 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcher.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.state.event.PrimaryStateChangedEvent;
-import
org.apache.shardingsphere.governance.core.registry.state.service.StatesNode;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/TerminalStateChangedWatcher.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/TerminalStateChangedWatcher.java
index 4fa4ca0..7596305 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/TerminalStateChangedWatcher.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/state/watcher/TerminalStateChangedWatcher.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.governance.core.registry.state.watcher;
import org.apache.shardingsphere.governance.core.registry.state.ResourceState;
-import
org.apache.shardingsphere.governance.core.registry.instance.GovernanceInstance;
+import org.apache.shardingsphere.governance.core.GovernanceInstance;
import org.apache.shardingsphere.governance.core.registry.GovernanceWatcher;
-import
org.apache.shardingsphere.governance.core.registry.state.service.StatesNode;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
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;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchema.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchema.java
similarity index 95%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchema.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchema.java
index 8b01f1b..f57efcc 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchema.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.schema;
+package org.apache.shardingsphere.governance.core.schema;
import com.google.common.base.Splitter;
import lombok.Getter;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaGroup.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaGroup.java
similarity index 96%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaGroup.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaGroup.java
index 61fdcef..2ece23ec 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaGroup.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaGroup.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.schema;
+package org.apache.shardingsphere.governance.core.schema;
import java.util.Collection;
import java.util.Collections;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstanceTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/GovernanceInstanceTest.java
similarity index 94%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstanceTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/GovernanceInstanceTest.java
index 01c0949..d324445 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstanceTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/GovernanceInstanceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.instance;
+package org.apache.shardingsphere.governance.core;
import org.junit.Test;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/cache/ScalingRegistrySubscriberTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/cache/subscriber/ScalingRegistrySubscriberTest.java
similarity index 96%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/cache/ScalingRegistrySubscriberTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/cache/subscriber/ScalingRegistrySubscriberTest.java
index db472f9..af5e6a7 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/cache/ScalingRegistrySubscriberTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/cache/subscriber/ScalingRegistrySubscriberTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.cache;
+package org.apache.shardingsphere.governance.core.registry.cache.subscriber;
+import
org.apache.shardingsphere.governance.core.registry.cache.RegistryCacheManager;
import
org.apache.shardingsphere.governance.core.registry.config.service.impl.SchemaRuleRegistryService;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.junit.Before;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/service/node/GlobalNodeTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/node/GlobalNodeTest.java
similarity index 98%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/service/node/GlobalNodeTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/node/GlobalNodeTest.java
index c8d2552..862335e 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/service/node/GlobalNodeTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/node/GlobalNodeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.config.service.node;
+package org.apache.shardingsphere.governance.core.registry.config.node;
import org.junit.Test;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/service/node/SchemaMetadataNodeTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/node/SchemaMetadataNodeTest.java
similarity index 99%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/service/node/SchemaMetadataNodeTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/node/SchemaMetadataNodeTest.java
index 64c134e..ccc0fa2 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/service/node/SchemaMetadataNodeTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/config/node/SchemaMetadataNodeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.config.service.node;
+package org.apache.shardingsphere.governance.core.registry.config.node;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.junit.Test;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/StatesNodeTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/node/StatesNodeTest.java
similarity index 97%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/StatesNodeTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/node/StatesNodeTest.java
index 3585aa5..5dd495d 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/StatesNodeTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/node/StatesNodeTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.state.service;
+package org.apache.shardingsphere.governance.core.registry.state.node;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import org.junit.Test;
import java.util.Arrays;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryServiceTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryServiceTest.java
index 1ef765a..a163b22 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryServiceTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/service/DataSourceStatusRegistryServiceTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.governance.core.registry.state.service;
import org.apache.shardingsphere.governance.core.registry.state.ResourceState;
+import
org.apache.shardingsphere.governance.core.registry.state.node.StatesNode;
import
org.apache.shardingsphere.governance.repository.spi.RegistryCenterRepository;
import org.apache.shardingsphere.infra.rule.event.impl.DataSourceDisabledEvent;
import org.apache.shardingsphere.infra.rule.event.impl.PrimaryDataSourceEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcherTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcherTest.java
index c13fa63..c7c57cd 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcherTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/state/watcher/DataSourceStateChangedWatcherTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.governance.core.registry.state.watcher;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
import org.apache.shardingsphere.governance.core.registry.GovernanceEvent;
import
org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaGroupTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaGroupTest.java
similarity index 97%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaGroupTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaGroupTest.java
index 0d6963d..76bf898 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaGroupTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaGroupTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.schema;
+package org.apache.shardingsphere.governance.core.schema;
import org.junit.Test;
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaTest.java
similarity index 96%
rename from
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaTest.java
rename to
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaTest.java
index 0f20c9d..5d9dc91 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/schema/GovernanceSchemaTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.governance.core.registry.schema;
+package org.apache.shardingsphere.governance.core.schema;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.junit.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 aaec7af..c9fb1b8 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
@@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap;
import org.apache.commons.dbcp2.BasicDataSource;
import
org.apache.shardingsphere.driver.governance.api.yaml.YamlGovernanceShardingSphereDataSourceFactory;
import
org.apache.shardingsphere.governance.context.metadata.GovernanceMetaDataContexts;
-import
org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema;
+import org.apache.shardingsphere.governance.core.schema.GovernanceSchema;
import
org.apache.shardingsphere.governance.core.registry.config.event.datasource.DataSourceAlteredEvent;
import
org.apache.shardingsphere.governance.core.registry.config.event.props.PropertiesChangedEvent;
import
org.apache.shardingsphere.governance.core.registry.state.event.DisabledStateChangedEvent;
@@ -49,6 +49,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -65,7 +66,7 @@ public final class GovernanceShardingSphereDataSourceTest {
}
private static GovernanceShardingSphereDataSource
getGovernanceShardingSphereDataSource() throws IOException, SQLException,
URISyntaxException {
- File yamlFile = new
File(GovernanceShardingSphereDataSourceTest.class.getResource("/yaml/unit/sharding.yaml").toURI());
+ File yamlFile = new
File(Objects.requireNonNull(GovernanceShardingSphereDataSourceTest.class.getResource("/yaml/unit/sharding.yaml")).toURI());
return (GovernanceShardingSphereDataSource)
YamlGovernanceShardingSphereDataSourceFactory.createDataSource(yamlFile);
}
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 8f20d17..663e520 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
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.proxy.initializer.impl;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.governance.context.metadata.GovernanceMetaDataContexts;
import
org.apache.shardingsphere.governance.context.transaction.GovernanceTransactionContexts;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.GlobalNode;
-import
org.apache.shardingsphere.governance.core.registry.config.service.node.SchemaMetadataNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.GlobalNode;
+import
org.apache.shardingsphere.governance.core.registry.config.node.SchemaMetadataNode;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingWorker.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingWorker.java
index 4f73125..9258944 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingWorker.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/ScalingWorker.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.api;
import com.google.common.eventbus.Subscribe;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.governance.core.registry.config.event.rule.SwitchRuleConfigurationEvent;
-import
org.apache.shardingsphere.governance.core.registry.cache.StartScalingEvent;
+import
org.apache.shardingsphere.governance.core.registry.cache.event.StartScalingEvent;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.scaling.core.config.HandleConfiguration;
import org.apache.shardingsphere.scaling.core.config.JobConfiguration;
