Refactor package structure of event builder (#31960)

apache · Jul 2, 2024 · 15e6a6a · 15e6a6a
1 parent 397a179
commit 15e6a6a
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 46 deletions.
diff --git a/.../QualifiedDataSourceStateServiceTest.java → ...iedDataSourceStatePersistServiceTest.java b/.../QualifiedDataSourceStateServiceTest.java → ...iedDataSourceStatePersistServiceTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.service;
+package org.apache.shardingsphere.mode.persist.service;
 
-import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import org.apache.shardingsphere.mode.persist.service.QualifiedDataSourceStatePersistService;
+import org.apache.shardingsphere.mode.spi.PersistRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -32,10 +31,10 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class QualifiedDataSourceStateServiceTest {
+class QualifiedDataSourceStatePersistServiceTest {
 
     @Mock
-    private ClusterPersistRepository repository;
+    private PersistRepository repository;
 
     @Test
     void assertLoadStatus() {

diff --git a/...der/ClusterStateDispatchEventBuilder.java → ...der/ClusterStateDispatchEventBuilder.java b/...der/ClusterStateDispatchEventBuilder.java → ...der/ClusterStateDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;

diff --git a/...omputeNodeOnlineDispatchEventBuilder.java → ...omputeNodeOnlineDispatchEventBuilder.java b/...omputeNodeOnlineDispatchEventBuilder.java → ...omputeNodeOnlineDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.instance.ComputeNodeData;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;

diff --git a/...ComputeNodeStateDispatchEventBuilder.java → ...ComputeNodeStateDispatchEventBuilder.java b/...ComputeNodeStateDispatchEventBuilder.java → ...ComputeNodeStateDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;

diff --git a/...ilder/GlobalRuleDispatchEventBuilder.java → ...ilder/GlobalRuleDispatchEventBuilder.java b/...ilder/GlobalRuleDispatchEventBuilder.java → ...ilder/GlobalRuleDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
 import org.apache.shardingsphere.mode.path.GlobalNodePath;

diff --git a/...ListenerAssistedDispatchEventBuilder.java → ...ListenerAssistedDispatchEventBuilder.java b/...ListenerAssistedDispatchEventBuilder.java → ...ListenerAssistedDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.listener.watch;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;

diff --git a/...ilder/PropertiesDispatchEventBuilder.java → ...ilder/PropertiesDispatchEventBuilder.java b/...ilder/PropertiesDispatchEventBuilder.java → ...ilder/PropertiesDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.mode.path.GlobalNodePath;
 import org.apache.shardingsphere.metadata.persist.node.GlobalNode;

diff --git a/...lifiedDataSourceDispatchEventBuilder.java → ...lifiedDataSourceDispatchEventBuilder.java b/...lifiedDataSourceDispatchEventBuilder.java → ...lifiedDataSourceDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;

diff --git a/...ardingSphereDataDispatchEventBuilder.java → ...ardingSphereDataDispatchEventBuilder.java b/...ardingSphereDataDispatchEventBuilder.java → ...ardingSphereDataDispatchEventBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.data.event.builder;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;

diff --git a/...A-INF/services/org.apache.shardingsphere.mode.event.builder.dispatch.DispatchEventBuilder b/...A-INF/services/org.apache.shardingsphere.mode.event.builder.dispatch.DispatchEventBuilder
@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.builder.QualifiedDataSourceDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.builder.ComputeNodeStateDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.builder.ClusterStateDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.data.event.builder.ShardingSphereDataDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder.GlobalRuleDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.global.event.builder.PropertiesDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.listener.watch.ListenerAssistedDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.builder.ComputeNodeOnlineDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.QualifiedDataSourceDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.ComputeNodeStateDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.ClusterStateDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.ShardingSphereDataDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.GlobalRuleDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.PropertiesDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.ListenerAssistedDispatchEventBuilder
+org.apache.shardingsphere.mode.manager.cluster.event.builder.ComputeNodeOnlineDispatchEventBuilder
diff --git a/...ClusterStateDispatchEventBuilderTest.java → ...ClusterStateDispatchEventBuilderTest.java b/...ClusterStateDispatchEventBuilderTest.java → ...ClusterStateDispatchEventBuilderTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.watcher;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.state.cluster.ClusterState;
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.builder.ClusterStateDispatchEventBuilder;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.event.ClusterStateEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;

diff --git a/...teNodeOnlineDispatchEventBuilderTest.java → ...teNodeOnlineDispatchEventBuilderTest.java b/...teNodeOnlineDispatchEventBuilderTest.java → ...teNodeOnlineDispatchEventBuilderTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.watcher;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.builder.ComputeNodeOnlineDispatchEventBuilder;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.InstanceOfflineEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.InstanceOnlineEvent;
 import org.junit.jupiter.api.Test;

diff --git a/...uteNodeStateDispatchEventBuilderTest.java → ...uteNodeStateDispatchEventBuilderTest.java b/...uteNodeStateDispatchEventBuilderTest.java → ...uteNodeStateDispatchEventBuilderTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.watcher;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.builder.ComputeNodeStateDispatchEventBuilder;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.LabelsEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ComputeNodeInstanceStateChangedEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;

diff --git a/...edDataSourceDispatchEventBuilderTest.java → ...edDataSourceDispatchEventBuilderTest.java b/...edDataSourceDispatchEventBuilderTest.java → ...edDataSourceDispatchEventBuilderTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.watcher;
+package org.apache.shardingsphere.mode.manager.cluster.event.builder;
 
 import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
 import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.QualifiedDataSourceStateEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.builder.QualifiedDataSourceDispatchEventBuilder;
 import org.junit.jupiter.api.Test;
 
 import java.util.Optional;

diff --git a/...ubscriber/CacheEvictedSubscriberTest.java → .../dispatch/CacheEvictedSubscriberTest.java b/...ubscriber/CacheEvictedSubscriberTest.java → .../dispatch/CacheEvictedSubscriberTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
 import org.apache.shardingsphere.infra.spi.type.ordered.cache.OrderedServicesCache;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.listener.DropDatabaseListenerAssistedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.CacheEvictedSubscriber;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;

diff --git a/...iber/ComputeNodeOnlineSubscriberTest.java → ...atch/ComputeNodeOnlineSubscriberTest.java b/...iber/ComputeNodeOnlineSubscriberTest.java → ...atch/ComputeNodeOnlineSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
@@ -28,7 +28,6 @@
 import org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.InstanceOfflineEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.compute.online.event.InstanceOnlineEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ComputeNodeOnlineSubscriber;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ber/ProcessListChangedSubscriberTest.java → ...tch/ProcessListChangedSubscriberTest.java b/...ber/ProcessListChangedSubscriberTest.java → ...tch/ProcessListChangedSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
@@ -38,7 +38,6 @@
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillLocalProcessEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ReportLocalProcessesCompletedEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ReportLocalProcessesEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ProcessListChangedSubscriber;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.apache.shardingsphere.mode.spi.PersistRepository;

diff --git a/...alifiedDataSourceStateSubscriberTest.java → ...alifiedDataSourceStateSubscriberTest.java b/...alifiedDataSourceStateSubscriberTest.java → ...alifiedDataSourceStateSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
 import org.apache.shardingsphere.mode.event.dispatch.datasource.qualified.QualifiedDataSourceDeletedEvent;

diff --git a/...er/QualifiedDataSourceSubscriberTest.java → ...ch/QualifiedDataSourceSubscriberTest.java b/...er/QualifiedDataSourceSubscriberTest.java → ...ch/QualifiedDataSourceSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
@@ -34,7 +34,6 @@
 import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
 import org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.QualifiedDataSourceStateEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.QualifiedDataSourceSubscriber;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;

diff --git a/...esourceMetaDataChangedSubscriberTest.java → ...esourceMetaDataChangedSubscriberTest.java b/...esourceMetaDataChangedSubscriberTest.java → ...esourceMetaDataChangedSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
@@ -27,13 +27,11 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
 import org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuilder;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ResourceMetaDataChangedSubscriber;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.junit.jupiter.api.BeforeEach;
@@ -64,9 +62,6 @@ class ResourceMetaDataChangedSubscriberTest {
 
     private ContextManager contextManager;
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private MetaDataPersistService persistService;
-
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private ShardingSphereDatabase database;
 

diff --git a/...ubscriber/StateChangedSubscriberTest.java → .../dispatch/StateChangedSubscriberTest.java b/...ubscriber/StateChangedSubscriberTest.java → .../dispatch/StateChangedSubscriberTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.subscriber;
+package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
 
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
@@ -36,7 +36,6 @@
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ComputeNodeInstanceStateChangedEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.LabelsEvent;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.WorkerIdEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StateChangedSubscriber;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.junit.jupiter.api.BeforeEach;