Move DeliverEventSubscriberRegistry to mode-core module

apache · Jan 10, 2025 · 30f9722 · 30f9722
1 parent e31fb25
commit 30f9722
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/...riber/ClusterEventSubscriberRegistry.java → ...liver/DeliverEventSubscriberRegistry.java b/...riber/ClusterEventSubscriberRegistry.java → ...liver/DeliverEventSubscriberRegistry.java
@@ -15,19 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.subscriber;
+package org.apache.shardingsphere.mode.deliver;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber;
 
 import java.util.Collection;
 
 /**
  * Cluster event subscriber registry.
  */
 @RequiredArgsConstructor
-public final class ClusterEventSubscriberRegistry {
+public final class DeliverEventSubscriberRegistry {
 
     private final EventBusContext eventBusContext;
 

diff --git a/...r/ClusterEventSubscriberRegistryTest.java → ...r/DeliverEventSubscriberRegistryTest.java b/...r/ClusterEventSubscriberRegistryTest.java → ...r/DeliverEventSubscriberRegistryTest.java
@@ -15,23 +15,22 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.subscriber;
+package org.apache.shardingsphere.mode.deliver;
 
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-class ClusterEventSubscriberRegistryTest {
+class DeliverEventSubscriberRegistryTest {
 
     @Test
     void assertRegister() {
         EventBusContext eventBusContext = mock(EventBusContext.class);
-        ClusterEventSubscriberRegistry registry = new ClusterEventSubscriberRegistry(eventBusContext);
+        DeliverEventSubscriberRegistry registry = new DeliverEventSubscriberRegistry(eventBusContext);
         DeliverEventSubscriber subscriber = mock(DeliverEventSubscriber.class);
         registry.register(Collections.singleton(subscriber));
         verify(eventBusContext).register(subscriber);

diff --git a/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -35,7 +35,7 @@
 import org.apache.shardingsphere.mode.manager.cluster.exception.MissingRequiredClusterRepositoryConfigurationException;
 import org.apache.shardingsphere.mode.manager.cluster.lock.ClusterLockContext;
 import org.apache.shardingsphere.mode.manager.cluster.persist.service.GlobalLockPersistService;
-import org.apache.shardingsphere.mode.manager.cluster.subscriber.ClusterEventSubscriberRegistry;
+import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriberRegistry;
 import org.apache.shardingsphere.mode.manager.cluster.workerid.ClusterWorkerIdGenerator;
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
@@ -80,8 +80,8 @@ private void registerOnline(final ComputeNodeInstanceContext computeNodeInstance
         contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().getAllClusterInstances()
                 .addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllComputeNodeInstances());
         new DataChangedEventListenerRegistry(contextManager, getDatabaseNames(param, contextManager.getPersistServiceFacade().getMetaDataPersistService())).register();
-        ClusterEventSubscriberRegistry eventSubscriberRegistry = new ClusterEventSubscriberRegistry(contextManager.getComputeNodeInstanceContext().getEventBusContext());
-        eventSubscriberRegistry.register(createDeliverEventSubscribers(repository));
+        DeliverEventSubscriberRegistry deliverEventSubscriberRegistry = new DeliverEventSubscriberRegistry(contextManager.getComputeNodeInstanceContext().getEventBusContext());
+        deliverEventSubscriberRegistry.register(createDeliverEventSubscribers(repository));
     }
 
     private Collection<String> getDatabaseNames(final ContextManagerBuilderParameter param, final MetaDataPersistService metaDataPersistService) {