This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 79f47606fe9 Refactor PersistServiceBuilder (#31420)
79f47606fe9 is described below
commit 79f47606fe982119a299ae30fc8bbd3a06fc65cd
Author: Haoran Meng <[email protected]>
AuthorDate: Tue May 28 10:32:04 2024 +0800
Refactor PersistServiceBuilder (#31420)
---
.../org/apache/shardingsphere/mode/service/PersistServiceFacade.java | 2 +-
.../shardingsphere/mode/service/persist/PersistServiceBuilder.java | 5 +++--
.../shardingsphere/mode/fixture/PersistServiceBuilderFixture.java | 3 ++-
.../mode/manager/cluster/service/ClusterPersistServiceBuilder.java | 5 +++--
.../manager/standalone/service/StandalonePersistServiceBuilder.java | 3 ++-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
index d83359fc7bd..3c63b6d4391 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
@@ -52,7 +52,7 @@ public final class PersistServiceFacade {
statePersistService = new StatePersistService(repository);
PersistServiceBuilder persistServiceBuilder =
TypedSPILoader.getService(PersistServiceBuilder.class,
modeConfiguration.getType());
metaDataManagerPersistService =
persistServiceBuilder.buildMetaDataManagerPersistService(contextManager);
- processPersistService =
persistServiceBuilder.buildProcessPersistService(contextManager);
+ processPersistService =
persistServiceBuilder.buildProcessPersistService(repository);
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/PersistServiceBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/PersistServiceBuilder.java
index b7a69d47da5..53abde32c4c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/PersistServiceBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/PersistServiceBuilder.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.mode.service.persist;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
* Persist service builder.
@@ -36,8 +37,8 @@ public interface PersistServiceBuilder extends TypedSPI {
/**
* Build process persist service.
*
- * @param contextManager context manager
+ * @param repository persist repository
* @return process persist service
*/
- ProcessPersistService buildProcessPersistService(ContextManager
contextManager);
+ ProcessPersistService buildProcessPersistService(PersistRepository
repository);
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/PersistServiceBuilderFixture.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/PersistServiceBuilderFixture.java
index b944de70f5f..a400e9718e5 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/PersistServiceBuilderFixture.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/PersistServiceBuilderFixture.java
@@ -21,6 +21,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.service.persist.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.service.persist.PersistServiceBuilder;
import org.apache.shardingsphere.mode.service.persist.ProcessPersistService;
+import org.apache.shardingsphere.mode.spi.PersistRepository;
public final class PersistServiceBuilderFixture implements
PersistServiceBuilder {
@@ -30,7 +31,7 @@ public final class PersistServiceBuilderFixture implements
PersistServiceBuilder
}
@Override
- public ProcessPersistService buildProcessPersistService(final
ContextManager contextManager) {
+ public ProcessPersistService buildProcessPersistService(final
PersistRepository repository) {
return null;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterPersistServiceBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterPersistServiceBuilder.java
index 1a27f072b9e..dc06995b15e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterPersistServiceBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterPersistServiceBuilder.java
@@ -21,6 +21,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.service.persist.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.service.persist.PersistServiceBuilder;
import org.apache.shardingsphere.mode.service.persist.ProcessPersistService;
+import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
* Cluster persist service builder.
@@ -33,8 +34,8 @@ public final class ClusterPersistServiceBuilder implements
PersistServiceBuilder
}
@Override
- public ProcessPersistService buildProcessPersistService(final
ContextManager contextManager) {
- return new
ClusterProcessPersistService(contextManager.getRepository());
+ public ProcessPersistService buildProcessPersistService(final
PersistRepository repository) {
+ return new ClusterProcessPersistService(repository);
}
@Override
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandalonePersistServiceBuilder.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandalonePersistServiceBuilder.java
index b77fbe2f49f..1e7e2efff12 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandalonePersistServiceBuilder.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandalonePersistServiceBuilder.java
@@ -21,6 +21,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.service.persist.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.service.persist.PersistServiceBuilder;
import org.apache.shardingsphere.mode.service.persist.ProcessPersistService;
+import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
* Standalone meta data manager persist service builder.
@@ -33,7 +34,7 @@ public final class StandalonePersistServiceBuilder implements
PersistServiceBuil
}
@Override
- public ProcessPersistService buildProcessPersistService(final
ContextManager contextManager) {
+ public ProcessPersistService buildProcessPersistService(final
PersistRepository repository) {
return new StandaloneProcessPersistService();
}
