This is an automated email from the ASF dual-hosted git repository. zhangliang 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 d370edd20eb Refactor dispatch.handler package structure (#34513) d370edd20eb is described below commit d370edd20eb5c7fb6369f5c469da5957599fd6b6 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun Jan 26 17:39:43 2025 +0800 Refactor dispatch.handler package structure (#34513) --- .../database/metadata/MetaDataChangedHandler.java | 5 +++++ .../metadata/{ => type}/SchemaChangedHandler.java | 2 +- .../{ => type}/StorageNodeChangedHandler.java | 2 +- .../{ => type}/StorageUnitChangedHandler.java | 2 +- .../metadata/{ => type}/TableChangedHandler.java | 2 +- .../metadata/{ => type}/ViewChangedHandler.java | 2 +- .../rule/RuleConfigurationChangedHandler.java | 2 ++ .../rule/{ => type}/NamedRuleItemChangedHandler.java | 2 +- .../{ => type}/UniqueRuleItemChangedHandler.java | 2 +- .../{ => global}/DataChangedEventHandler.java | 2 +- .../{ => type}/ClusterStateChangedHandler.java | 4 ++-- .../global/{ => type}/ComputeNodeOnlineHandler.java | 4 ++-- .../{ => type}/ComputeNodeStateChangedHandler.java | 4 ++-- .../{ => type}/DatabaseListenerChangedHandler.java | 4 ++-- .../global/{ => type}/GlobalRuleChangedHandler.java | 4 ++-- .../global/{ => type}/KillProcessHandler.java | 4 ++-- .../global/{ => type}/PropertiesChangedHandler.java | 4 ++-- .../QualifiedDataSourceChangedHandler.java | 4 ++-- .../global/{ => type}/ShowProcessListHandler.java | 4 ++-- .../global/{ => type}/StatisticsChangedHandler.java | 4 ++-- .../listener/DataChangedEventListenerRegistry.java | 2 +- .../listener/type/GlobalMetaDataChangedListener.java | 2 +- ....dispatch.handler.global.DataChangedEventHandler} | 20 ++++++++++---------- .../{ => type}/ClusterStateChangedHandlerTest.java | 4 ++-- .../{ => type}/ComputeNodeOnlineHandlerTest.java | 4 ++-- .../ComputeNodeStateChangedHandlerTest.java | 4 ++-- .../DatabaseListenerChangedHandlerTest.java | 4 ++-- .../{ => type}/GlobalRuleChangedHandlerTest.java | 4 ++-- .../global/{ => type}/KillProcessHandlerTest.java | 4 ++-- .../{ => type}/PropertiesChangedHandlerTest.java | 4 ++-- .../QualifiedDataSourceChangedHandlerTest.java | 4 ++-- .../{ => type}/ShowProcessListHandlerTest.java | 4 ++-- .../{ => type}/StatisticsChangedHandlerTest.java | 4 ++-- 33 files changed, 67 insertions(+), 60 deletions(-) diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java index 23f7f229e55..d71dacc76f4 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandler.java @@ -17,6 +17,11 @@ package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.SchemaChangedHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.StorageNodeChangedHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.StorageUnitChangedHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.TableChangedHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type.ViewChangedHandler; import org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath; import org.apache.shardingsphere.mode.node.path.metadata.DataSourceMetaDataNodePath; import org.apache.shardingsphere.mode.node.path.metadata.TableMetaDataNodePath; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/SchemaChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/SchemaChangedHandler.java index 799536e3bf4..f88c482c796 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/SchemaChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/StorageNodeChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageNodeChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/StorageNodeChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageNodeChangedHandler.java index 28e2e69d138..076d38de0bf 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/StorageNodeChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageNodeChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.event.DataChangedEvent; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/StorageUnitChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java similarity index 99% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/StorageUnitChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java index cc1ebcf9241..3f8df8cefc8 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/StorageUnitChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type; import com.google.common.base.Preconditions; import lombok.RequiredArgsConstructor; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java similarity index 99% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java index db22c9423e4..081cfd2515c 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/TableChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable; import org.apache.shardingsphere.mode.node.path.metadata.TableMetaDataNodePath; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java similarity index 99% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java index ba543a9930e..9a92b24353d 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/ViewChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.type; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView; import org.apache.shardingsphere.mode.node.path.metadata.ViewMetaDataNodePath; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java index 1a54b7d0df7..71d163f8ec4 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java @@ -22,6 +22,8 @@ import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule.type.NamedRuleItemChangedHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule.type.UniqueRuleItemChangedHandler; import org.apache.shardingsphere.mode.node.path.rule.RuleNodePath; import org.apache.shardingsphere.mode.node.path.rule.item.NamedRuleItemNodePath; import org.apache.shardingsphere.mode.node.path.rule.item.UniqueRuleItemNodePath; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/NamedRuleItemChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/NamedRuleItemChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java index 111f762dfc9..2aaefbaa618 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/NamedRuleItemChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/NamedRuleItemChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule.type; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.event.DataChangedEvent; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/UniqueRuleItemChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/UniqueRuleItemChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java index 2f34569aae2..dc88ecae3f5 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/UniqueRuleItemChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/type/UniqueRuleItemChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule.type; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.event.DataChangedEvent; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/DataChangedEventHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DataChangedEventHandler.java similarity index 99% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/DataChangedEventHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DataChangedEventHandler.java index 03dd7461bcc..f3c0a596d88 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/DataChangedEventHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DataChangedEventHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.mode.event.DataChangedEvent; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java similarity index 97% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java index ff891cc3c5a..cd140794ca8 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.StatesNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import org.apache.shardingsphere.mode.state.cluster.ClusterState; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java index ca0ca0d00ba..631aded211c 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.instance.ComputeNodeData; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; @@ -25,11 +25,11 @@ import org.apache.shardingsphere.infra.instance.metadata.InstanceType; import org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeData; import org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeDataSwapper; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java index 44758a4869d..7b03cdbd31a 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import com.google.common.base.Strings; import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import java.util.ArrayList; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java index 9f3627bad46..9717fa1a2d7 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.DatabaseMetaDataChangedListener; import org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine; import org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalRuleChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java similarity index 97% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalRuleChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java index 37cfe0dbeb5..a812f2fbdac 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalRuleChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import com.google.common.base.Preconditions; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; @@ -23,7 +23,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.checker.ActiveVersionChecker; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.GlobalRuleNodePath; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java index 68c3f6f8896..0655e5ad902 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.exception.core.external.sql.type.wrapper.SQLWrapperException; import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry; import org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import java.sql.SQLException; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/PropertiesChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java similarity index 97% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/PropertiesChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java index 525f0d11062..caaf25e3642 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/PropertiesChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.checker.ActiveVersionChecker; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.GlobalPropertiesNodePath; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/QualifiedDataSourceChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/QualifiedDataSourceChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java index be87c591b86..51fc507df37 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/QualifiedDataSourceChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -26,11 +26,11 @@ import org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataS import org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceState; import org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.metadata.QualifiedDataSourceNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java similarity index 98% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java index 523662b70c4..a5f91899fca 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java similarity index 99% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java index bb3f62c399f..e8dbcaa2e72 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import com.google.common.base.Strings; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.metadata.ShardingSphereStatisticsNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; import org.apache.shardingsphere.mode.metadata.manager.StatisticsManager; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java index 46aa19481fb..ef65c2f7208 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.cluster.dispatch.listener; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.DatabaseMetaDataChangedListener; import org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.GlobalMetaDataChangedListener; import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/GlobalMetaDataChangedListener.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/GlobalMetaDataChangedListener.java index bd5e427f248..ed85fd9f359 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/GlobalMetaDataChangedListener.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/GlobalMetaDataChangedListener.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.infra.spi.type.ordered.cache.OrderedServicesCache; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener; /** diff --git a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler similarity index 78% rename from mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler rename to mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler index 49db601b082..cd61dbec68d 100644 --- a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler +++ b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler @@ -15,13 +15,13 @@ # limitations under the License. # -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ClusterStateChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.QualifiedDataSourceChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ComputeNodeOnlineHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ComputeNodeStateChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.StatisticsChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalRuleChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.PropertiesChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DatabaseListenerChangedHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ShowProcessListHandler -org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.KillProcessHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.ClusterStateChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.QualifiedDataSourceChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.ComputeNodeOnlineHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.ComputeNodeStateChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.StatisticsChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.GlobalRuleChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.PropertiesChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.DatabaseListenerChangedHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.ShowProcessListHandler +org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type.KillProcessHandler diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java similarity index 97% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java index c70655fef8c..45c7ac712f9 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.state.cluster.ClusterState; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java index 7b25a1f95e4..7b7a9fdeed4 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java index d35e7a546c6..404512568e0 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java index f38a8b4875c..dbbaf833ee0 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.StatesNodePath; import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository; import org.junit.jupiter.api.BeforeEach; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalRuleChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalRuleChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java index ffe962acfea..78ac893c002 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalRuleChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java index 92d494a3259..6940e95473c 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.test.mock.AutoMockExtension; import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.junit.jupiter.api.BeforeEach; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/PropertiesChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java similarity index 97% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/PropertiesChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java index 0656a32e3fc..7b6db93995a 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/PropertiesChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/QualifiedDataSourceChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/QualifiedDataSourceChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java index 8c413618247..e5371e89fe3 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/QualifiedDataSourceChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource; import org.apache.shardingsphere.infra.rule.attribute.datasource.StaticDataSourceRuleAttribute; @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.state.datasource.DataSourceState; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java similarity index 98% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java index b303fcf5b80..7107beb4ccf 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry; import org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry; @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.apache.shardingsphere.test.mock.AutoMockExtension; import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.junit.jupiter.api.BeforeEach; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java similarity index 99% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java index 1daf75ffea5..4f66f9ea7b1 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/StatisticsChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global; +package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.type; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;