Move DatabaseChangedListenerAssistedPersistService to cluster-core module (#34484)

Author: terrymanu

mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java

@@ -21,16 +21,15 @@
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
 import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
 import org.apache.shardingsphere.mode.persist.service.ProcessPersistService;
+import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.state.cluster.ClusterStatePersistService;
 import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
 import org.apache.shardingsphere.mode.state.node.QualifiedDataSourceStatePersistService;
-import org.apache.shardingsphere.mode.state.cluster.ClusterStatePersistService;
-import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
 /**
  * Persist service facade.
@@ -50,8 +49,6 @@ public final class PersistServiceFacade {
 
     private final ProcessPersistService processPersistService;
 
-    private final DatabaseChangedListenerAssistedPersistService databaseChangedListenerAssistedPersistService;
-    
     private final QualifiedDataSourceStatePersistService qualifiedDataSourceStatePersistService;
 
     public PersistServiceFacade(final PersistRepository repository, final ModeConfiguration modeConfig, final MetaDataContextManager metaDataContextManager) {
@@ -63,7 +60,6 @@ public PersistServiceFacade(final PersistRepository repository, final ModeConfig
         PersistServiceBuilder persistServiceBuilder = TypedSPILoader.getService(PersistServiceBuilder.class, modeConfig.getType());
         metaDataManagerPersistService = persistServiceBuilder.buildMetaDataManagerPersistService(repository, metaDataContextManager);
         processPersistService = persistServiceBuilder.buildProcessPersistService(repository);
-        databaseChangedListenerAssistedPersistService = new DatabaseChangedListenerAssistedPersistService(repository);
     }
 
     /**

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java

@@ -27,8 +27,8 @@
 import org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
 import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
+import org.apache.shardingsphere.mode.manager.cluster.persist.service.DatabaseChangedListenerAssistedPersistService;
+import org.apache.shardingsphere.mode.manager.cluster.persist.service.DatabaseChangedListenerAssistedType;
 
 import java.util.Arrays;
 import java.util.Collection;

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java

@@ -38,8 +38,6 @@
 import org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
 import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
 import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
 import org.apache.shardingsphere.single.rule.SingleRule;
 

mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java renamed to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.state.database;
+package org.apache.shardingsphere.mode.manager.cluster.persist.service;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;

mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java renamed to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.state.database;
+package org.apache.shardingsphere.mode.manager.cluster.persist.service;
 
 /**
  * Database changed listener assisted type.

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandlerTest.java

@@ -63,7 +63,7 @@ void setUp() {
     @Test
     void assertHandleWithoutDatabase() {
         handler.handle(contextManager, new DataChangedEvent("/states/listener_assisted", "", Type.ADDED));
-        verify(contextManager.getPersistServiceFacade(), times(0)).getDatabaseChangedListenerAssistedPersistService();
+        verify(contextManager.getPersistServiceFacade(), times(0)).getRepository();
     }
 
     @Test

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java

@@ -25,8 +25,6 @@
 import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
 import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
-import org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
 import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
 import org.apache.shardingsphere.single.rule.SingleRule;
 import org.junit.jupiter.api.BeforeEach;

mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java renamed to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.state.database;
+package org.apache.shardingsphere.mode.manager.cluster.persist.service;
 
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 import org.junit.jupiter.api.Test;