Skip to content

Commit 5fd5c17

Browse files
authored
Refactor MetaDataManagerPersistService's impl (#34405)
1 parent 9634a25 commit 5fd5c17

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/builder/ClusterPersistServiceBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class ClusterPersistServiceBuilder implements PersistServiceBuilder
3232

3333
@Override
3434
public MetaDataManagerPersistService buildMetaDataManagerPersistService(final PersistRepository repository, final MetaDataContextManager metaDataContextManager) {
35-
return new ClusterMetaDataManagerPersistService(repository, metaDataContextManager);
35+
return new ClusterMetaDataManagerPersistService(metaDataContextManager, repository);
3636
}
3737

3838
@Override

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
*/
5858
public final class ClusterMetaDataManagerPersistService implements MetaDataManagerPersistService {
5959

60+
private final MetaDataContextManager metaDataContextManager;
61+
6062
private final MetaDataPersistService metaDataPersistService;
6163

6264
private final ListenerAssistedPersistService listenerAssistedPersistService;
6365

64-
private final MetaDataContextManager metaDataContextManager;
65-
66-
public ClusterMetaDataManagerPersistService(final PersistRepository repository, final MetaDataContextManager metaDataContextManager) {
66+
public ClusterMetaDataManagerPersistService(final MetaDataContextManager metaDataContextManager, final PersistRepository repository) {
67+
this.metaDataContextManager = metaDataContextManager;
6768
metaDataPersistService = metaDataContextManager.getMetaDataPersistService();
6869
listenerAssistedPersistService = new ListenerAssistedPersistService(repository);
69-
this.metaDataContextManager = metaDataContextManager;
7070
}
7171

7272
@Override

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class ClusterMetaDataManagerPersistServiceTest {
7070
@SneakyThrows(ReflectiveOperationException.class)
7171
@BeforeEach
7272
void setUp() {
73-
metaDataManagerPersistService = new ClusterMetaDataManagerPersistService(mock(PersistRepository.class), metaDataContextManager);
73+
metaDataManagerPersistService = new ClusterMetaDataManagerPersistService(metaDataContextManager, mock(PersistRepository.class));
7474
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("metaDataPersistService"), metaDataManagerPersistService, metaDataPersistService);
7575
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("listenerAssistedPersistService"), metaDataManagerPersistService, listenerAssistedPersistService);
7676
}

mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
*/
6363
public final class StandaloneMetaDataManagerPersistService implements MetaDataManagerPersistService {
6464

65-
private final MetaDataPersistService metaDataPersistService;
66-
6765
private final MetaDataContextManager metaDataContextManager;
6866

67+
private final MetaDataPersistService metaDataPersistService;
68+
6969
private final RuleItemChangedBuilder ruleItemChangedBuilder;
7070

7171
public StandaloneMetaDataManagerPersistService(final MetaDataContextManager metaDataContextManager) {

0 commit comments

Comments
 (0)