From 30f972261f6a72903c19d378eae145f5654dcafe Mon Sep 17 00:00:00 2001 From: zhangliang Date: Fri, 10 Jan 2025 19:55:46 +0800 Subject: [PATCH 1/2] Move DeliverEventSubscriberRegistry to mode-core module --- .../mode/deliver/DeliverEventSubscriberRegistry.java} | 5 ++--- .../mode/deliver/DeliverEventSubscriberRegistryTest.java} | 7 +++---- .../mode/manager/cluster/ClusterContextManagerBuilder.java | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) rename mode/{type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistry.java => core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java} (87%) rename mode/{type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistryTest.java => core/src/test/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistryTest.java} (84%) diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistry.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java similarity index 87% rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistry.java rename to mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java index 834ad78342738..b93dcceab7679 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistry.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java @@ -15,11 +15,10 @@ * 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; @@ -27,7 +26,7 @@ * Cluster event subscriber registry. */ @RequiredArgsConstructor -public final class ClusterEventSubscriberRegistry { +public final class DeliverEventSubscriberRegistry { private final EventBusContext eventBusContext; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistryTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistryTest.java similarity index 84% rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistryTest.java rename to mode/core/src/test/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistryTest.java index 887f64552ffa6..39606794582e8 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/subscriber/ClusterEventSubscriberRegistryTest.java +++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistryTest.java @@ -15,10 +15,9 @@ * 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; @@ -26,12 +25,12 @@ 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/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java index 1bd21d551f223..e53b3fd87f9ee 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java +++ b/mode/type/cluster/core/src/main/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 getDatabaseNames(final ContextManagerBuilderParameter param, final MetaDataPersistService metaDataPersistService) { From b9da778dc8c3825f055516bd2fa39def2d9d9536 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Fri, 10 Jan 2025 19:56:58 +0800 Subject: [PATCH 2/2] Move DeliverEventSubscriberRegistry to mode-core module --- .../mode/deliver/DeliverEventSubscriberRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java index b93dcceab7679..fd7198424e658 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/deliver/DeliverEventSubscriberRegistry.java @@ -31,7 +31,7 @@ public final class DeliverEventSubscriberRegistry { private final EventBusContext eventBusContext; /** - * Register subscribers. + * Register deliver event subscribers. * * @param subscribers to be registered subscribers */