Refactor ClusterEventSubscriberRegistry (#34247)

apache · Jan 4, 2025 · d5d7eb2 · d5d7eb2
1 parent 52a599d
commit d5d7eb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -26,7 +26,6 @@
 import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
 import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber;
 import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -91,8 +90,8 @@ private Collection<String> getDatabaseNames(final ContextManagerBuilderParameter
                 : metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().loadAllDatabaseNames();
     }
 
-    private Collection<EventSubscriber> createDeliverEventSubscribers(final PersistRepository repository) {
-        Collection<EventSubscriber> result = new LinkedList<>();
+    private Collection<DeliverEventSubscriber> createDeliverEventSubscribers(final PersistRepository repository) {
+        Collection<DeliverEventSubscriber> result = new LinkedList<>();
         for (DeliverEventSubscriber each : ShardingSphereServiceLoader.getServiceInstances(DeliverEventSubscriber.class)) {
             each.setRepository(repository);
             result.add(each);

diff --git a/...apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistry.java b/...apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistry.java
@@ -19,7 +19,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
+import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber;
 
 import java.util.Collection;
 
@@ -36,7 +36,7 @@ public final class ClusterEventSubscriberRegistry {
      *
      * @param subscribers to be registered subscribers
      */
-    public void register(final Collection<EventSubscriber> subscribers) {
+    public void register(final Collection<DeliverEventSubscriber> subscribers) {
         subscribers.forEach(eventBusContext::register);
     }
 }