This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 7bdfdd3a953 Rename GovernanceEventWatcher to DispatchEventBuilder
(#31764)
7bdfdd3a953 is described below
commit 7bdfdd3a953171b79789cd2cb88927ed2184e169
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Jun 19 18:14:40 2024 +0800
Rename GovernanceEventWatcher to DispatchEventBuilder (#31764)
---
...er.java => ListenerAssistedDispatchEventBuilder.java} | 4 ++--
.../builder/ShardingSphereDataDispatchEventBuilder.java} | 6 +++---
.../event/builder/GlobalRuleDispatchEventBuilder.java} | 6 +++---
.../event/builder/PropertiesDispatchEventBuilder.java} | 6 +++---
.../builder/ComputeNodeOnlineDispatchEventBuilder.java} | 6 +++---
.../QualifiedDataSourceDispatchEventBuilder.java} | 6 +++---
.../builder/ClusterStateDispatchEventBuilder.java} | 6 +++---
.../builder/ComputeNodeStateDispatchEventBuilder.java} | 6 +++---
...ger.cluster.coordinator.registry.DispatchEventBuilder | 16 ++++++++--------
...va => ComputeNodeOnlineDispatchEventBuilderTest.java} | 7 ++++---
...st.java => ClusterStateDispatchEventBuilderTest.java} | 9 +++++----
...ava => ComputeNodeStateDispatchEventBuilderTest.java} | 11 ++++++-----
... => QualifiedDataSourceDispatchEventBuilderTest.java} | 10 +++++-----
13 files changed, 51 insertions(+), 48 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/watch/ListenerAssistedChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/watch/ListenerAssistedDispatchEventBuilder.java
similarity index 95%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/watch/ListenerAssistedChangedWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/watch/ListenerAssistedDispatchEventBuilder.java
index 3e70d7bcbfb..3e3df169fee 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/watch/ListenerAssistedChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/watch/ListenerAssistedDispatchEventBuilder.java
@@ -33,9 +33,9 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Listener assisted changed watcher.
+ * Listener assisted dispatch event builder.
*/
-public class ListenerAssistedChangedWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public class ListenerAssistedDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/data/ShardingSphereDataChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/data/event/builder/ShardingSphereDataDispatchEventBuilder.java
similarity index 97%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/data/ShardingSphereDataChangedWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/data/event/builder/ShardingSphereDataDispatchEventBuilder.java
index 5cada4332f4..a06f8e54e3d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/data/ShardingSphereDataChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/data/event/builder/ShardingSphereDataDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.data;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.data.event.builder;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -40,9 +40,9 @@ import java.util.Collections;
import java.util.Optional;
/**
- * ShardingSphere data changed watcher.
+ * ShardingSphere data dispatch event builder.
*/
-public final class ShardingSphereDataChangedWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public final class ShardingSphereDataDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/watcher/GlobalRuleChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/global/event/builder/GlobalRuleDispatchEventBuilder.java
similarity index 92%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/watcher/GlobalRuleChangedWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/global/event/builder/GlobalRuleDispatchEventBuilder.java
index 7f35e043ef9..777e7f0dcf2 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/watcher/GlobalRuleChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/global/event/builder/GlobalRuleDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.watcher;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.path.GlobalNodePath;
@@ -31,9 +31,9 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Global rule changed watcher.
+ * Global rule dispatch event builder.
*/
-public final class GlobalRuleChangedWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public final class GlobalRuleDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/watcher/PropertiesChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/global/event/builder/PropertiesDispatchEventBuilder.java
similarity index 91%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/watcher/PropertiesChangedWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/global/event/builder/PropertiesDispatchEventBuilder.java
index 85fb2c4adc8..5a78d488930 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/watcher/PropertiesChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/global/event/builder/PropertiesDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.watcher;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder;
import org.apache.shardingsphere.mode.path.GlobalNodePath;
import org.apache.shardingsphere.metadata.persist.node.GlobalNode;
@@ -30,9 +30,9 @@ import java.util.Collection;
import java.util.Optional;
/**
- * Properties changed watcher.
+ * Properties dispatch event builder.
*/
-public final class PropertiesChangedWatcher implements
DispatchEventBuilder<AlterPropertiesEvent> {
+public final class PropertiesDispatchEventBuilder implements
DispatchEventBuilder<AlterPropertiesEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/event/builder/ComputeNodeOnlineDispatchEventBuilder.java
similarity index 95%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/event/builder/ComputeNodeOnlineDispatchEventBuilder.java
index 6498dcd2b60..91db1df5f38 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/event/builder/ComputeNodeOnlineDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.watcher;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.builder;
import org.apache.shardingsphere.infra.instance.ComputeNodeData;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
@@ -40,9 +40,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Compute node online watcher.
+ * Compute node online dispatch event builder.
*/
-public final class ComputeNodeOnlineWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public final class ComputeNodeOnlineDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
similarity index 93%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
index dafa496b64b..db5576e9103 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/watcher/QualifiedDataSourceWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.watcher;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.builder;
import com.google.common.base.Strings;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
@@ -36,9 +36,9 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Qualified data source watcher.
+ * Qualified data source dispatch event builder.
*/
-public final class QualifiedDataSourceWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public final class QualifiedDataSourceDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/event/builder/ClusterStateDispatchEventBuilder.java
similarity index 93%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateChangedWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/event/builder/ClusterStateDispatchEventBuilder.java
index 86c7931f905..4c1f328ef76 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/event/builder/ClusterStateDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.watcher;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.builder;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
@@ -32,9 +32,9 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Cluster state changed watcher.
+ * Cluster state dispatch event builder.
*/
-public final class ClusterStateChangedWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public final class ClusterStateDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/builder/ComputeNodeStateDispatchEventBuilder.java
similarity index 96%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/builder/ComputeNodeStateDispatchEventBuilder.java
index 95d3352e341..8d9b2729a83 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/event/builder/ComputeNodeStateDispatchEventBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.watcher;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.builder;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
@@ -41,9 +41,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Compute node state changed watcher.
+ * Compute node state dispatch event builder.
*/
-public final class ComputeNodeStateChangedWatcher implements
DispatchEventBuilder<GovernanceEvent> {
+public final class ComputeNodeStateDispatchEventBuilder implements
DispatchEventBuilder<GovernanceEvent> {
@Override
public Collection<String> getSubscribedKeys() {
diff --git
a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.DispatchEventBuilder
b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.DispatchEventBuilder
index 95bc0d0c8d1..db4bda3c4bf 100644
---
a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.DispatchEventBuilder
+++
b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.DispatchEventBuilder
@@ -15,11 +15,11 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.watcher.QualifiedDataSourceWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.watcher.ComputeNodeStateChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.watcher.ClusterStateChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.data.ShardingSphereDataChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.watcher.GlobalRuleChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.watcher.PropertiesChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.listener.watch.ListenerAssistedChangedWatcher
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.watcher.ComputeNodeOnlineWatcher
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.builder.QualifiedDataSourceDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.builder.ComputeNodeStateDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.builder.ClusterStateDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.data.event.builder.ShardingSphereDataDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder.GlobalRuleDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder.PropertiesDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.listener.watch.ListenerAssistedDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.builder.ComputeNodeOnlineDispatchEventBuilder
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineWatcherTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineDispatchEventBuilderTest.java
similarity index 92%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineWatcherTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineDispatchEventBuilderTest.java
index 357000de020..6b2935693c5 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineWatcherTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/compute/online/watcher/ComputeNodeOnlineDispatchEventBuilderTest.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.builder.ComputeNodeOnlineDispatchEventBuilder;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.InstanceOfflineEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.InstanceOnlineEvent;
import org.junit.jupiter.api.Test;
@@ -31,11 +32,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class ComputeNodeOnlineWatcherTest {
+class ComputeNodeOnlineDispatchEventBuilderTest {
@Test
void assertComputeNodeOnline() {
- Optional<GovernanceEvent> actual = new ComputeNodeOnlineWatcher()
+ Optional<GovernanceEvent> actual = new
ComputeNodeOnlineDispatchEventBuilder()
.build(new
DataChangedEvent("/nodes/compute_nodes/online/proxy/foo_instance_id",
"{attribute: 127.0.0.1@3307,version: 1}", Type.ADDED));
assertTrue(actual.isPresent());
InstanceOnlineEvent event = (InstanceOnlineEvent) actual.get();
@@ -48,7 +49,7 @@ class ComputeNodeOnlineWatcherTest {
@Test
void assertComputeNodeOffline() {
- Optional<GovernanceEvent> actual = new ComputeNodeOnlineWatcher()
+ Optional<GovernanceEvent> actual = new
ComputeNodeOnlineDispatchEventBuilder()
.build(new
DataChangedEvent("/nodes/compute_nodes/online/proxy/foo_instance_id",
"{attribute: 127.0.0.1@3307,version: 1}", Type.DELETED));
assertTrue(actual.isPresent());
InstanceOfflineEvent event = (InstanceOfflineEvent) actual.get();
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateChangedWatcherTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateDispatchEventBuilderTest.java
similarity index 85%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateChangedWatcherTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateDispatchEventBuilderTest.java
index 60c047bafc4..2ff089307d8 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateChangedWatcherTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/cluster/watcher/ClusterStateDispatchEventBuilderTest.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.stat
import org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.builder.ClusterStateDispatchEventBuilder;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.ClusterStateEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
@@ -30,11 +31,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class ClusterStateChangedWatcherTest {
+class ClusterStateDispatchEventBuilderTest {
@Test
void assertCreateEventWhenReadOnly() {
- Optional<GovernanceEvent> actual = new ClusterStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ClusterStateDispatchEventBuilder()
.build(new DataChangedEvent("/nodes/compute_nodes/status",
ClusterState.READ_ONLY.name(), Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((ClusterStateEvent) actual.get()).getClusterState(),
is(ClusterState.READ_ONLY));
@@ -42,7 +43,7 @@ class ClusterStateChangedWatcherTest {
@Test
void assertCreateEventWhenUnavailable() {
- Optional<GovernanceEvent> actual = new ClusterStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ClusterStateDispatchEventBuilder()
.build(new DataChangedEvent("/nodes/compute_nodes/status",
ClusterState.UNAVAILABLE.name(), Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((ClusterStateEvent) actual.get()).getClusterState(),
is(ClusterState.UNAVAILABLE));
@@ -50,7 +51,7 @@ class ClusterStateChangedWatcherTest {
@Test
void assertCreateEventWhenEnabled() {
- Optional<GovernanceEvent> actual = new ClusterStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ClusterStateDispatchEventBuilder()
.build(new DataChangedEvent("/nodes/compute_nodes/status",
ClusterState.OK.name(), Type.UPDATED));
assertTrue(actual.isPresent());
assertThat(((ClusterStateEvent) actual.get()).getClusterState(),
is(ClusterState.OK));
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcherTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateDispatchEventBuilderTest.java
similarity index 87%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcherTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateDispatchEventBuilderTest.java
index a1d56bdb565..a2db24de5d8 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateChangedWatcherTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/watcher/ComputeNodeStateDispatchEventBuilderTest.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.stat
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.builder.ComputeNodeStateDispatchEventBuilder;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.LabelsEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ComputeNodeInstanceStateChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
@@ -33,11 +34,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class ComputeNodeStateChangedWatcherTest {
+class ComputeNodeStateDispatchEventBuilderTest {
@Test
void assertCreateEventWhenDisabled() {
- Optional<GovernanceEvent> actual = new ComputeNodeStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ComputeNodeStateDispatchEventBuilder()
.build(new
DataChangedEvent("/nodes/compute_nodes/status/foo_instance_id",
InstanceState.CIRCUIT_BREAK.name(), Type.ADDED));
assertTrue(actual.isPresent());
assertThat(((ComputeNodeInstanceStateChangedEvent)
actual.get()).getStatus(), is(InstanceState.CIRCUIT_BREAK.name()));
@@ -46,7 +47,7 @@ class ComputeNodeStateChangedWatcherTest {
@Test
void assertCreateEventWhenEnabled() {
- Optional<GovernanceEvent> actual = new ComputeNodeStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ComputeNodeStateDispatchEventBuilder()
.build(new
DataChangedEvent("/nodes/compute_nodes/status/foo_instance_id", "",
Type.UPDATED));
assertTrue(actual.isPresent());
assertTrue(((ComputeNodeInstanceStateChangedEvent)
actual.get()).getStatus().isEmpty());
@@ -55,7 +56,7 @@ class ComputeNodeStateChangedWatcherTest {
@Test
void assertCreateAddLabelEvent() {
- Optional<GovernanceEvent> actual = new ComputeNodeStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ComputeNodeStateDispatchEventBuilder()
.build(new
DataChangedEvent("/nodes/compute_nodes/labels/foo_instance_id",
YamlEngine.marshal(Arrays.asList("label_1",
"label_2")), Type.ADDED));
assertTrue(actual.isPresent());
@@ -65,7 +66,7 @@ class ComputeNodeStateChangedWatcherTest {
@Test
void assertCreateUpdateLabelsEvent() {
- Optional<GovernanceEvent> actual = new ComputeNodeStateChangedWatcher()
+ Optional<GovernanceEvent> actual = new
ComputeNodeStateDispatchEventBuilder()
.build(new
DataChangedEvent("/nodes/compute_nodes/labels/foo_instance_id",
YamlEngine.marshal(Arrays.asList("label_1",
"label_2")), Type.UPDATED));
assertTrue(actual.isPresent());
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceWatcherTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
similarity index 93%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceWatcherTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
index db55fad7b24..b5587b637e3 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceWatcherTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
@@ -22,7 +22,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.cluster.coordinator.registry.nodes.storage.event.QualifiedDataSourceStateEvent;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.watcher.QualifiedDataSourceWatcher;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.builder.QualifiedDataSourceDispatchEventBuilder;
import org.junit.jupiter.api.Test;
import java.util.Optional;
@@ -32,11 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class QualifiedDataSourceWatcherTest {
+class QualifiedDataSourceDispatchEventBuilderTest {
@Test
void assertCreateEnabledQualifiedDataSourceChangedEvent() {
- Optional<GovernanceEvent> actual = new
QualifiedDataSourceWatcher().build(
+ Optional<GovernanceEvent> actual = new
QualifiedDataSourceDispatchEventBuilder().build(
new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"status: ENABLED\n", Type.ADDED));
assertTrue(actual.isPresent());
QualifiedDataSourceStateEvent actualEvent =
(QualifiedDataSourceStateEvent) actual.get();
@@ -48,7 +48,7 @@ class QualifiedDataSourceWatcherTest {
@Test
void assertCreateDisabledQualifiedDataSourceChangedEvent() {
- Optional<GovernanceEvent> actual = new
QualifiedDataSourceWatcher().build(
+ Optional<GovernanceEvent> actual = new
QualifiedDataSourceDispatchEventBuilder().build(
new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"status: DISABLED\n", Type.DELETED));
assertTrue(actual.isPresent());
QualifiedDataSourceStateEvent actualEvent =
(QualifiedDataSourceStateEvent) actual.get();
@@ -60,7 +60,7 @@ class QualifiedDataSourceWatcherTest {
@Test
void assertCreateEmptyEvent() {
- Optional<GovernanceEvent> actual = new
QualifiedDataSourceWatcher().build(
+ Optional<GovernanceEvent> actual = new
QualifiedDataSourceDispatchEventBuilder().build(
new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"", Type.ADDED));
assertFalse(actual.isPresent());
}
