Skip to content

Commit 37493e8

Browse files
authored
Refactor MetaDataPersistFacade (#35000)
1 parent 69553a2 commit 37493e8

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public final class DatabaseRuleItemManager {
5656
public void alter(final DatabaseRuleNodePath databaseRuleNodePath) throws SQLException {
5757
RuleItemConfigurationChangedProcessor processor = TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class,
5858
new RuleChangedItemType(databaseRuleNodePath.getRuleType(), databaseRuleNodePath.getDatabaseRuleItem().getType()));
59-
String yamlContent = metaDataPersistFacade.getMetaDataVersionService().loadContent(new VersionNodePath(databaseRuleNodePath));
59+
String yamlContent = metaDataPersistFacade.getVersionService().loadContent(new VersionNodePath(databaseRuleNodePath));
6060
String databaseName = databaseRuleNodePath.getDatabase().getDatabaseName();
6161
RuleConfiguration currentRuleConfig = processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
6262
String itemName = databaseRuleNodePath.getDatabaseRuleItem().getName();

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacade.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public final class MetaDataPersistFacade {
5656

5757
private final PersistRepository repository;
5858

59-
private final VersionPersistService metaDataVersionService;
59+
private final VersionPersistService versionService;
6060

6161
private final DataSourceUnitPersistService dataSourceUnitService;
6262

@@ -72,12 +72,12 @@ public final class MetaDataPersistFacade {
7272

7373
public MetaDataPersistFacade(final PersistRepository repository) {
7474
this.repository = repository;
75-
metaDataVersionService = new VersionPersistService(repository);
75+
versionService = new VersionPersistService(repository);
7676
dataSourceUnitService = new DataSourceUnitPersistService(repository);
77-
databaseMetaDataFacade = new DatabaseMetaDataPersistFacade(repository, metaDataVersionService);
77+
databaseMetaDataFacade = new DatabaseMetaDataPersistFacade(repository, versionService);
7878
databaseRuleService = new DatabaseRulePersistService(repository);
79-
globalRuleService = new GlobalRulePersistService(repository, metaDataVersionService);
80-
propsService = new PropertiesPersistService(repository, metaDataVersionService);
79+
globalRuleService = new GlobalRulePersistService(repository, versionService);
80+
propsService = new PropertiesPersistService(repository, versionService);
8181
statisticsService = new StatisticsPersistService(repository);
8282
}
8383

mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void assertAlterSingleRuleConfiguration() throws SQLException {
166166
@Test
167167
void assertAlterNullRuleConfiguration() throws SQLException {
168168
metaDataManagerPersistService.alterRuleConfiguration(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), null);
169-
verify(metaDataPersistFacade, times(0)).getMetaDataVersionService();
169+
verify(metaDataPersistFacade, times(0)).getVersionService();
170170
}
171171

172172
@Test
@@ -195,7 +195,7 @@ void assertAlterRuleConfiguration() throws SQLException {
195195
@Test
196196
void assertRemoveNullRuleConfigurationItem() throws SQLException {
197197
metaDataManagerPersistService.removeRuleConfigurationItem(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), null);
198-
verify(metaDataPersistFacade, times(0)).getMetaDataVersionService();
198+
verify(metaDataPersistFacade, times(0)).getVersionService();
199199
}
200200

201201
@Test

0 commit comments

Comments
 (0)