Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move DeliverEventSubscriberRegistry to mode-core module #34300

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Move DeliverEventSubscriberRegistry to mode-core module #34300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f9722
Move DeliverEventSubscriberRegistry to mode-core module
terrymanu Jan 10, 2025
b9da778
Move DeliverEventSubscriberRegistry to mode-core module
terrymanu Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ...riber/ClusterEventSubscriberRegistry.java → ...liver/DeliverEventSubscriberRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,23 @@
* 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;

/**
* Register subscribers.
* Register deliver event subscribers.
*
* @param subscribers to be registered subscribers
*/
Expand Down
7 changes: 3 additions & 4 deletions ...r/ClusterEventSubscriberRegistryTest.java → ...r/DeliverEventSubscriberRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
Loading