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 5fd5c17e457 Refactor MetaDataManagerPersistService's impl (#34405)
5fd5c17e457 is described below
commit 5fd5c17e457526ca6e9e9321ff8fc36083dbe295
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Jan 20 00:08:05 2025 +0800
Refactor MetaDataManagerPersistService's impl (#34405)
---
.../cluster/persist/builder/ClusterPersistServiceBuilder.java | 2 +-
.../persist/service/ClusterMetaDataManagerPersistService.java | 8 ++++----
.../persist/service/ClusterMetaDataManagerPersistServiceTest.java | 2 +-
.../persist/service/StandaloneMetaDataManagerPersistService.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/builder/ClusterPersistServiceBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/builder/ClusterPersistServiceBuilder.java
index 3d58e5fc120..ac0cd1c4daf 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/builder/ClusterPersistServiceBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/builder/ClusterPersistServiceBuilder.java
@@ -32,7 +32,7 @@ public final class ClusterPersistServiceBuilder implements
PersistServiceBuilder
@Override
public MetaDataManagerPersistService
buildMetaDataManagerPersistService(final PersistRepository repository, final
MetaDataContextManager metaDataContextManager) {
- return new ClusterMetaDataManagerPersistService(repository,
metaDataContextManager);
+ return new
ClusterMetaDataManagerPersistService(metaDataContextManager, repository);
}
@Override
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 50dcedea8f0..7727d460e90 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -57,16 +57,16 @@ import java.util.stream.Collectors;
*/
public final class ClusterMetaDataManagerPersistService implements
MetaDataManagerPersistService {
+ private final MetaDataContextManager metaDataContextManager;
+
private final MetaDataPersistService metaDataPersistService;
private final ListenerAssistedPersistService
listenerAssistedPersistService;
- private final MetaDataContextManager metaDataContextManager;
-
- public ClusterMetaDataManagerPersistService(final PersistRepository
repository, final MetaDataContextManager metaDataContextManager) {
+ public ClusterMetaDataManagerPersistService(final MetaDataContextManager
metaDataContextManager, final PersistRepository repository) {
+ this.metaDataContextManager = metaDataContextManager;
metaDataPersistService =
metaDataContextManager.getMetaDataPersistService();
listenerAssistedPersistService = new
ListenerAssistedPersistService(repository);
- this.metaDataContextManager = metaDataContextManager;
}
@Override
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index e8e9aff1b92..fe73c381692 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -70,7 +70,7 @@ class ClusterMetaDataManagerPersistServiceTest {
@SneakyThrows(ReflectiveOperationException.class)
@BeforeEach
void setUp() {
- metaDataManagerPersistService = new
ClusterMetaDataManagerPersistService(mock(PersistRepository.class),
metaDataContextManager);
+ metaDataManagerPersistService = new
ClusterMetaDataManagerPersistService(metaDataContextManager,
mock(PersistRepository.class));
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("metaDataPersistService"),
metaDataManagerPersistService, metaDataPersistService);
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("listenerAssistedPersistService"),
metaDataManagerPersistService, listenerAssistedPersistService);
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 263266ccfa0..7c40216e241 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -62,10 +62,10 @@ import java.util.stream.Collectors;
*/
public final class StandaloneMetaDataManagerPersistService implements
MetaDataManagerPersistService {
- private final MetaDataPersistService metaDataPersistService;
-
private final MetaDataContextManager metaDataContextManager;
+ private final MetaDataPersistService metaDataPersistService;
+
private final RuleItemChangedBuilder ruleItemChangedBuilder;
public StandaloneMetaDataManagerPersistService(final
MetaDataContextManager metaDataContextManager) {
