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 2aa566d6930 Rename GlobalDataChangedEventHandler (#34514) 2aa566d6930 is described below commit 2aa566d69304ffcb007b9e8325effc80bd13a76a Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun Jan 26 18:17:39 2025 +0800 Rename GlobalDataChangedEventHandler (#34514) --- ...aChangedEventHandler.java => GlobalDataChangedEventHandler.java} | 4 ++-- .../dispatch/handler/global/type/ClusterStateChangedHandler.java | 4 ++-- .../dispatch/handler/global/type/ComputeNodeOnlineHandler.java | 4 ++-- .../handler/global/type/ComputeNodeStateChangedHandler.java | 4 ++-- .../handler/global/type/DatabaseListenerChangedHandler.java | 4 ++-- .../dispatch/handler/global/type/GlobalRuleChangedHandler.java | 4 ++-- .../cluster/dispatch/handler/global/type/KillProcessHandler.java | 4 ++-- .../dispatch/handler/global/type/PropertiesChangedHandler.java | 4 ++-- .../handler/global/type/QualifiedDataSourceChangedHandler.java | 4 ++-- .../dispatch/handler/global/type/ShowProcessListHandler.java | 4 ++-- .../dispatch/handler/global/type/StatisticsChangedHandler.java | 4 ++-- .../cluster/dispatch/listener/DataChangedEventListenerRegistry.java | 6 +++--- .../dispatch/listener/type/GlobalMetaDataChangedListener.java | 4 ++-- ...r.cluster.dispatch.handler.global.GlobalDataChangedEventHandler} | 0 .../handler/global/type/ClusterStateChangedHandlerTest.java | 6 +++--- .../dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java | 6 +++--- .../handler/global/type/ComputeNodeStateChangedHandlerTest.java | 6 +++--- .../handler/global/type/DatabaseListenerChangedHandlerTest.java | 6 +++--- .../dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java | 6 +++--- .../dispatch/handler/global/type/KillProcessHandlerTest.java | 6 +++--- .../dispatch/handler/global/type/PropertiesChangedHandlerTest.java | 6 +++--- .../handler/global/type/QualifiedDataSourceChangedHandlerTest.java | 6 +++--- .../dispatch/handler/global/type/ShowProcessListHandlerTest.java | 6 +++--- .../dispatch/handler/global/type/StatisticsChangedHandlerTest.java | 6 +++--- 24 files changed, 57 insertions(+), 57 deletions(-) diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DataChangedEventHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalDataChangedEventHandler.java similarity index 95% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DataChangedEventHandler.java rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalDataChangedEventHandler.java index f3c0a596d88..3076a5ccbed 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DataChangedEventHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/GlobalDataChangedEventHandler.java @@ -25,10 +25,10 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import java.util.Collection; /** - * Data changed event handler. + * Global data changed event handler. */ @SingletonSPI -public interface DataChangedEventHandler { +public interface GlobalDataChangedEventHandler { /** * Get subscribed key. diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java index cd140794ca8..e68b1db3388 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java @@ -17,7 +17,7 @@ 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.StatesNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -30,7 +30,7 @@ import java.util.Collection; /** * Cluster state changed handler. */ -public final class ClusterStateChangedHandler implements DataChangedEventHandler { +public final class ClusterStateChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java index 631aded211c..b705ffeffff 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java @@ -25,7 +25,7 @@ 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -39,7 +39,7 @@ import java.util.regex.Pattern; /** * Compute node online handler. */ -public final class ComputeNodeOnlineHandler implements DataChangedEventHandler { +public final class ComputeNodeOnlineHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java index 7b03cdbd31a..7fe99621f0d 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.t 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -33,7 +33,7 @@ import java.util.Collection; /** * Compute node state changed handler. */ -public final class ComputeNodeStateChangedHandler implements DataChangedEventHandler { +public final class ComputeNodeStateChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java index 9717fa1a2d7..a502160acf0 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java @@ -21,7 +21,7 @@ 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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; 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; @@ -36,7 +36,7 @@ import java.util.Collection; /** * Database listener changed handler. */ -public final class DatabaseListenerChangedHandler implements DataChangedEventHandler { +public final class DatabaseListenerChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java index a812f2fbdac..51f846eba79 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java @@ -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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.GlobalRuleNodePath; import java.util.Arrays; @@ -33,7 +33,7 @@ import java.util.Optional; /** * Global rule changed handler. */ -public final class GlobalRuleChangedHandler implements DataChangedEventHandler { +public final class GlobalRuleChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java index 0655e5ad902..112c05cb833 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.t 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -35,7 +35,7 @@ import java.util.regex.Pattern; /** * Kill process handler. */ -public final class KillProcessHandler implements DataChangedEventHandler { +public final class KillProcessHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java index caaf25e3642..9d39722f81f 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java @@ -21,7 +21,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.GlobalPropertiesNodePath; import java.util.Arrays; @@ -30,7 +30,7 @@ import java.util.Collection; /** * Properties changed handler. */ -public final class PropertiesChangedHandler implements DataChangedEventHandler { +public final class PropertiesChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java index 51fc507df37..238206f091b 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java @@ -26,7 +26,7 @@ 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.metadata.QualifiedDataSourceNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -39,7 +39,7 @@ import java.util.Optional; /** * Qualified data source changed handler. */ -public final class QualifiedDataSourceChangedHandler implements DataChangedEventHandler { +public final class QualifiedDataSourceChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java index a5f91899fca..159295b94dd 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java @@ -18,7 +18,7 @@ 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; /** * Show process list handler. */ -public final class ShowProcessListHandler implements DataChangedEventHandler { +public final class ShowProcessListHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java index e8dbcaa2e72..48678e09163 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.t 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.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.metadata.ShardingSphereStatisticsNodePath; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; @@ -34,7 +34,7 @@ import java.util.Optional; /** * Statistics changed handler. */ -public final class StatisticsChangedHandler implements DataChangedEventHandler { +public final class StatisticsChangedHandler implements GlobalDataChangedEventHandler { @Override public String getSubscribedKey() { 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 ef65c2f7208..5b7acb471b8 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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; 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; @@ -49,14 +49,14 @@ public final class DataChangedEventListenerRegistry { */ public void register() { databaseNames.forEach(this::registerDatabaseListeners); - ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).forEach(this::registerGlobalHandlers); + ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).forEach(this::registerGlobalHandlers); } private void registerDatabaseListeners(final String databaseName) { repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new DatabaseMetaDataChangedListener(contextManager)); } - private void registerGlobalHandlers(final DataChangedEventHandler handler) { + private void registerGlobalHandlers(final GlobalDataChangedEventHandler handler) { repository.watch(handler.getSubscribedKey(), new GlobalMetaDataChangedListener(contextManager, handler)); } } 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 ed85fd9f359..a5b47ad0b96 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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener; /** @@ -32,7 +32,7 @@ public final class GlobalMetaDataChangedListener implements DataChangedEventList private final ContextManager contextManager; - private final DataChangedEventHandler handler; + private final GlobalDataChangedEventHandler handler; @Override public void onChange(final DataChangedEvent event) { diff --git a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler similarity index 100% rename from mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DataChangedEventHandler rename to mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java index 45c7ac712f9..99624055f18 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandlerTest.java @@ -21,7 +21,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.state.cluster.ClusterState; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,14 +35,14 @@ import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) class ClusterStateChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/states/cluster_state")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java index 7b7a9fdeed4..a42efa72d85 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandlerTest.java @@ -22,7 +22,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,14 +39,14 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class ComputeNodeOnlineHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/nodes/compute_nodes/online")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java index 404512568e0..e9c6587508a 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandlerTest.java @@ -21,7 +21,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -37,14 +37,14 @@ import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) class ComputeNodeStateChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/nodes/compute_nodes")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java index dbbaf833ee0..a32c0c53394 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandlerTest.java @@ -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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.state.StatesNodePath; import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository; import org.junit.jupiter.api.BeforeEach; @@ -44,7 +44,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class DatabaseListenerChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @@ -56,7 +56,7 @@ class DatabaseListenerChangedHandlerTest { void setUp() { when(contextManager.getPersistServiceFacade().getRepository()).thenReturn(repository); when(contextManager.getMetaDataContexts().getMetaData().getTemporaryProps()).thenReturn(new TemporaryConfigurationProperties(new Properties())); - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/states/database_listener_coordinator")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java index 78ac893c002..557ccf82657 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java @@ -22,7 +22,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -40,14 +40,14 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class GlobalRuleChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/rules")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java index 6940e95473c..4807689c26f 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandlerTest.java @@ -22,7 +22,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.test.mock.AutoMockExtension; import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.junit.jupiter.api.BeforeEach; @@ -43,7 +43,7 @@ import static org.mockito.Mockito.when; @StaticMockSettings(ProcessOperationLockRegistry.class) class KillProcessHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @@ -51,7 +51,7 @@ class KillProcessHandlerTest { @BeforeEach void setUp() { when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId()).thenReturn("foo_instance_id"); - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/nodes/compute_nodes/kill_process_trigger")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java index 7b6db93995a..46a9d82f446 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandlerTest.java @@ -21,7 +21,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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,14 +39,14 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class PropertiesChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/props")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java index e5371e89fe3..c8ad6bc9193 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandlerTest.java @@ -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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -44,14 +44,14 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class QualifiedDataSourceChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/nodes/qualified_data_sources")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java index 7107beb4ccf..3c6a4becc41 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandlerTest.java @@ -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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.test.mock.AutoMockExtension; import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.junit.jupiter.api.BeforeEach; @@ -46,7 +46,7 @@ import static org.mockito.Mockito.when; @StaticMockSettings({ProcessRegistry.class, ProcessOperationLockRegistry.class}) class ShowProcessListHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @@ -54,7 +54,7 @@ class ShowProcessListHandlerTest { @BeforeEach void setUp() { when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId()).thenReturn("foo_instance_id"); - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/nodes/compute_nodes/show_process_list_trigger")).findFirst().orElse(null); } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java index 4f66f9ea7b1..95f142dc1f8 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandlerTest.java @@ -22,7 +22,7 @@ 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.global.DataChangedEventHandler; +import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,14 +39,14 @@ import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) class StatisticsChangedHandlerTest { - private DataChangedEventHandler handler; + private GlobalDataChangedEventHandler handler; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private ContextManager contextManager; @BeforeEach void setUp() { - handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream() + handler = ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream() .filter(each -> each.getSubscribedKey().equals("/statistics/databases")).findFirst().orElse(null); }