This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 14a9fb2a887 Move DeliverEventSubscriberRegistry to mode-core module
(#34300)
14a9fb2a887 is described below
commit 14a9fb2a887f9cd80322202afcaa9639522f71ca
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 10 19:59:39 2025 +0800
Move DeliverEventSubscriberRegistry to mode-core module (#34300)
* Move DeliverEventSubscriberRegistry to mode-core module
* Move DeliverEventSubscriberRegistry to mode-core module
---
.../mode/deliver/DeliverEventSubscriberRegistry.java} | 7 +++----
.../mode/deliver/DeliverEventSubscriberRegistryTest.java} | 7 +++----
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 6 +++---
3 files changed, 9 insertions(+), 11 deletions(-)
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 85%
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 834ad783427..fd7198424e6 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,12 +26,12 @@ import java.util.Collection;
* Cluster event subscriber registry.
*/
@RequiredArgsConstructor
-public final class ClusterEventSubscriberRegistry {
+public final class DeliverEventSubscriberRegistry {
private final EventBusContext eventBusContext;
/**
- * Register subscribers.
+ * Register deliver event subscribers.
*
* @param subscribers to be registered subscribers
*/
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 887f64552ff..39606794582 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 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/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 1bd21d551f2..e53b3fd87f9 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.dispatch.listener.DataChan
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 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
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) {
