This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 4b142d37d0e Move WorkerIdEvent and LabelsEvent subscriber to 
ComputeNodeStateSubscriber (#32699)
4b142d37d0e is described below

commit 4b142d37d0e1b8003a3fd49930815e7207a90afb
Author: Haoran Meng <[email protected]>
AuthorDate: Tue Aug 27 11:51:07 2024 +0800

    Move WorkerIdEvent and LabelsEvent subscriber to ComputeNodeStateSubscriber 
(#32699)
---
 ...criber.java => ComputeNodeStateSubscriber.java} | 38 ++++++++++++++++++++--
 ...ber.java => DatabaseDataChangedSubscriber.java} |  4 +--
 ...scriber.java => MetaDataChangedSubscriber.java} |  4 +--
 .../dispatch/StateChangedSubscriber.java           | 36 +-------------------
 .../ClusterDispatchEventSubscriberRegistry.java    | 12 +++----
 ...st.java => ComputeNodeStateSubscriberTest.java} | 32 ++++++++++++++++--
 ...est.java => MetaDataChangedSubscriberTest.java} |  6 ++--
 .../dispatch/StateChangedSubscriberTest.java       | 28 +---------------
 8 files changed, 80 insertions(+), 80 deletions(-)

diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeOnlineSubscriber.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriber.java
similarity index 62%
rename from 
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeOnlineSubscriber.java
rename to 
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriber.java
index 653d6ad1634..3a9591fce7c 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeOnlineSubscriber.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriber.java
@@ -21,15 +21,18 @@ import com.google.common.eventbus.Subscribe;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
+import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.ComputeNodeInstanceStateChangedEvent;
+import org.apache.shardingsphere.mode.event.dispatch.state.compute.LabelsEvent;
+import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.WorkerIdEvent;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.instance.InstanceOfflineEvent;
 import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.instance.InstanceOnlineEvent;
 
 /**
- * Compute node online subscriber.
+ * Compute node state subscriber.
  */
 @RequiredArgsConstructor
-public final class ComputeNodeOnlineSubscriber implements EventSubscriber {
+public final class ComputeNodeStateSubscriber implements EventSubscriber {
     
     private final ContextManager contextManager;
     
@@ -53,4 +56,35 @@ public final class ComputeNodeOnlineSubscriber implements 
EventSubscriber {
     public synchronized void renew(final InstanceOfflineEvent event) {
         
contextManager.getComputeNodeInstanceContext().deleteComputeNodeInstance(new 
ComputeNodeInstance(event.getInstanceMetaData()));
     }
+    
+    /**
+     * Renew compute node instance state.
+     *
+     * @param event compute node instance state changed event
+     */
+    @Subscribe
+    public synchronized void renew(final ComputeNodeInstanceStateChangedEvent 
event) {
+        
contextManager.getComputeNodeInstanceContext().updateStatus(event.getInstanceId(),
 event.getStatus());
+    }
+    
+    /**
+     * Renew instance worker id.
+     *
+     * @param event worker id event
+     */
+    @Subscribe
+    public synchronized void renew(final WorkerIdEvent event) {
+        
contextManager.getComputeNodeInstanceContext().updateWorkerId(event.getInstanceId(),
 event.getWorkerId());
+    }
+    
+    /**
+     * Renew instance labels.
+     *
+     * @param event label event
+     */
+    @Subscribe
+    public synchronized void renew(final LabelsEvent event) {
+        // TODO labels may be empty
+        
contextManager.getComputeNodeInstanceContext().updateLabel(event.getInstanceId(),
 event.getLabels());
+    }
 }
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseChangedSubscriber.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java
similarity index 97%
rename from 
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseChangedSubscriber.java
rename to 
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java
index e952480bc34..c28f0de9c47 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseChangedSubscriber.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java
@@ -30,11 +30,11 @@ import 
org.apache.shardingsphere.mode.event.dispatch.metadata.data.ShardingSpher
 import 
org.apache.shardingsphere.mode.event.dispatch.metadata.data.TableDataChangedEvent;
 
 /**
- * Database changed subscriber.
+ * Database data changed subscriber.
  */
 @RequiredArgsConstructor
 @SuppressWarnings("unused")
-public final class DatabaseChangedSubscriber implements EventSubscriber {
+public final class DatabaseDataChangedSubscriber implements EventSubscriber {
     
     private final ContextManager contextManager;
     
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriber.java
similarity index 98%
rename from 
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
rename to 
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriber.java
index 7cd83c8da10..ddf48cc33d4 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriber.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriber.java
@@ -38,11 +38,11 @@ import 
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
 import java.util.Map;
 
 /**
- * Resource meta data changed subscriber.
+ * Meta data changed subscriber.
  */
 @RequiredArgsConstructor
 @SuppressWarnings("unused")
-public final class ResourceMetaDataChangedSubscriber implements 
EventSubscriber {
+public final class MetaDataChangedSubscriber implements EventSubscriber {
     
     private final ContextManager contextManager;
     
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriber.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriber.java
index ea0f967111d..84643696dd1 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriber.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriber.java
@@ -19,11 +19,8 @@ package 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch
 
 import com.google.common.eventbus.Subscribe;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
-import org.apache.shardingsphere.mode.manager.ContextManager;
 import 
org.apache.shardingsphere.mode.event.dispatch.state.cluster.ClusterStateEvent;
-import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.ComputeNodeInstanceStateChangedEvent;
-import org.apache.shardingsphere.mode.event.dispatch.state.compute.LabelsEvent;
-import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.WorkerIdEvent;
+import org.apache.shardingsphere.mode.manager.ContextManager;
 
 /**
  * State changed subscriber.
@@ -46,35 +43,4 @@ public final class StateChangedSubscriber implements 
EventSubscriber {
     public synchronized void renew(final ClusterStateEvent event) {
         
contextManager.getStateContext().switchClusterState(event.getClusterState());
     }
-    
-    /**
-     * Renew compute node instance state.
-     *
-     * @param event compute node instance state changed event
-     */
-    @Subscribe
-    public synchronized void renew(final ComputeNodeInstanceStateChangedEvent 
event) {
-        
contextManager.getComputeNodeInstanceContext().updateStatus(event.getInstanceId(),
 event.getStatus());
-    }
-    
-    /**
-     * Renew instance worker id.
-     *
-     * @param event worker id event
-     */
-    @Subscribe
-    public synchronized void renew(final WorkerIdEvent event) {
-        
contextManager.getComputeNodeInstanceContext().updateWorkerId(event.getInstanceId(),
 event.getWorkerId());
-    }
-    
-    /**
-     * Renew instance labels.
-     *
-     * @param event label event
-     */
-    @Subscribe
-    public synchronized void renew(final LabelsEvent event) {
-        // TODO labels may be empty
-        
contextManager.getComputeNodeInstanceContext().updateLabel(event.getInstanceId(),
 event.getLabels());
-    }
 }
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java
index cee730a8d87..b46a1a1ac26 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java
@@ -21,14 +21,14 @@ import lombok.Getter;
 import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.CacheEvictedSubscriber;
-import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ComputeNodeOnlineSubscriber;
-import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.DatabaseChangedSubscriber;
+import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ComputeNodeStateSubscriber;
+import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.DatabaseDataChangedSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.GlobalRuleConfigurationEventSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ListenerAssistedSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ProcessListChangedSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.PropertiesEventSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.QualifiedDataSourceSubscriber;
-import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ResourceMetaDataChangedSubscriber;
+import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.MetaDataChangedSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.RuleItemChangedSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StateChangedSubscriber;
 import 
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StorageUnitEventSubscriber;
@@ -46,13 +46,13 @@ public final class ClusterDispatchEventSubscriberRegistry {
     
     public ClusterDispatchEventSubscriberRegistry(final ContextManager 
contextManager) {
         subscribers = Arrays.asList(new 
RuleItemChangedSubscriber(contextManager),
-                new ResourceMetaDataChangedSubscriber(contextManager),
+                new MetaDataChangedSubscriber(contextManager),
                 new ListenerAssistedSubscriber(contextManager),
                 new StateChangedSubscriber(contextManager),
-                new DatabaseChangedSubscriber(contextManager),
+                new DatabaseDataChangedSubscriber(contextManager),
                 new ProcessListChangedSubscriber(contextManager),
                 new CacheEvictedSubscriber(),
-                new ComputeNodeOnlineSubscriber(contextManager),
+                new ComputeNodeStateSubscriber(contextManager),
                 new QualifiedDataSourceSubscriber(contextManager),
                 new StorageUnitEventSubscriber(contextManager),
                 new PropertiesEventSubscriber(contextManager),
diff --git 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeOnlineSubscriberTest.java
 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java
similarity index 76%
rename from 
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeOnlineSubscriberTest.java
rename to 
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java
index bc75bec651b..aaca97abf46 100644
--- 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeOnlineSubscriberTest.java
+++ 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java
@@ -22,7 +22,11 @@ import 
org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
 import 
org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
+import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
+import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.ComputeNodeInstanceStateChangedEvent;
+import org.apache.shardingsphere.mode.event.dispatch.state.compute.LabelsEvent;
+import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.WorkerIdEvent;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
 import 
org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
@@ -38,6 +42,7 @@ import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 
 import java.sql.SQLException;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Properties;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -48,9 +53,9 @@ import static org.mockito.Mockito.mock;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class ComputeNodeOnlineSubscriberTest {
+class ComputeNodeStateSubscriberTest {
     
-    private ComputeNodeOnlineSubscriber subscriber;
+    private ComputeNodeStateSubscriber subscriber;
     
     private ContextManager contextManager;
     
@@ -59,7 +64,7 @@ class ComputeNodeOnlineSubscriberTest {
         EventBusContext eventBusContext = new EventBusContext();
         contextManager = new 
ClusterContextManagerBuilder().build(createContextManagerBuilderParameter(), 
eventBusContext);
         
contextManager.renewMetaDataContexts(MetaDataContextsFactory.create(contextManager.getPersistServiceFacade().getMetaDataPersistService(),
 mock(ShardingSphereMetaData.class)));
-        subscriber = new ComputeNodeOnlineSubscriber(contextManager);
+        subscriber = new ComputeNodeStateSubscriber(contextManager);
     }
     
     @Test
@@ -91,4 +96,25 @@ class ComputeNodeOnlineSubscriberTest {
         return new ContextManagerBuilderParameter(modeConfig, 
Collections.emptyMap(), Collections.emptyMap(), Collections.emptyList(),
                 new Properties(), Collections.emptyList(), instanceMetaData, 
false);
     }
+    
+    @Test
+    void assertRenewInstanceState() {
+        ComputeNodeInstanceStateChangedEvent event = new 
ComputeNodeInstanceStateChangedEvent(
+                
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId(),
 InstanceState.OK.name());
+        subscriber.renew(event);
+        
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(),
 is(InstanceState.OK));
+    }
+    
+    @Test
+    void assertRenewInstanceWorkerIdEvent() {
+        subscriber.renew(new 
WorkerIdEvent(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId(),
 0));
+        
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getWorkerId(),
 is(0));
+    }
+    
+    @Test
+    void assertRenewInstanceLabels() {
+        Collection<String> labels = Collections.singletonList("test");
+        subscriber.renew(new 
LabelsEvent(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId(),
 labels));
+        
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getLabels(),
 is(labels));
+    }
 }
diff --git 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriberTest.java
 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java
similarity index 96%
rename from 
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriberTest.java
rename to 
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java
index a4ecf6b9a6a..b39486d67da 100644
--- 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ResourceMetaDataChangedSubscriberTest.java
+++ 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java
@@ -57,9 +57,9 @@ import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-class ResourceMetaDataChangedSubscriberTest {
+class MetaDataChangedSubscriberTest {
     
-    private ResourceMetaDataChangedSubscriber subscriber;
+    private MetaDataChangedSubscriber subscriber;
     
     private ContextManager contextManager;
     
@@ -72,7 +72,7 @@ class ResourceMetaDataChangedSubscriberTest {
         
contextManager.renewMetaDataContexts(MetaDataContextsFactory.create(contextManager.getPersistServiceFacade().getMetaDataPersistService(),
 new ShardingSphereMetaData(createDatabases(),
                 
contextManager.getMetaDataContexts().getMetaData().getGlobalResourceMetaData(), 
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(),
                 new ConfigurationProperties(new Properties()))));
-        subscriber = new ResourceMetaDataChangedSubscriber(contextManager);
+        subscriber = new MetaDataChangedSubscriber(contextManager);
     }
     
     private ContextManagerBuilderParameter 
createContextManagerBuilderParameter() {
diff --git 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriberTest.java
 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriberTest.java
index b04cfe10206..edd5ed1a7e0 100644
--- 
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriberTest.java
+++ 
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StateChangedSubscriberTest.java
@@ -28,15 +28,11 @@ import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.infra.state.cluster.ClusterState;
-import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
+import 
org.apache.shardingsphere.mode.event.dispatch.state.cluster.ClusterStateEvent;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
 import 
org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
-import 
org.apache.shardingsphere.mode.event.dispatch.state.cluster.ClusterStateEvent;
-import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.ComputeNodeInstanceStateChangedEvent;
-import org.apache.shardingsphere.mode.event.dispatch.state.compute.LabelsEvent;
-import 
org.apache.shardingsphere.mode.event.dispatch.state.compute.WorkerIdEvent;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
 import 
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +45,6 @@ import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 
 import java.sql.SQLException;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
@@ -101,25 +96,4 @@ class StateChangedSubscriberTest {
         subscriber.renew(mockClusterStateEvent);
         assertThat(contextManager.getStateContext().getClusterState(), 
is(ClusterState.READ_ONLY));
     }
-    
-    @Test
-    void assertRenewInstanceState() {
-        ComputeNodeInstanceStateChangedEvent event = new 
ComputeNodeInstanceStateChangedEvent(
-                
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId(),
 InstanceState.OK.name());
-        subscriber.renew(event);
-        
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(),
 is(InstanceState.OK));
-    }
-    
-    @Test
-    void assertRenewInstanceWorkerIdEvent() {
-        subscriber.renew(new 
WorkerIdEvent(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId(),
 0));
-        
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getWorkerId(),
 is(0));
-    }
-    
-    @Test
-    void assertRenewInstanceLabels() {
-        Collection<String> labels = Collections.singletonList("test");
-        subscriber.renew(new 
LabelsEvent(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getId(),
 labels));
-        
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getLabels(),
 is(labels));
-    }
 }

Reply via email to