Rename GlobalPersistService.persistConfigurations() (#31033)

apache · Apr 27, 2024 · f5b9f24 · f5b9f24
1 parent 1a0b731
commit f5b9f24
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/...rg/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java b/...rg/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
@@ -39,10 +39,10 @@ public interface GlobalPersistService<T> {
     /**
      * Persist configurations.
      *
-     * @param globalRuleConfigs configurations
+     * @param globalRuleConfigs global configurations
      * @return meta data versions
      */
-    Collection<MetaDataVersion> persistConfig(T globalRuleConfigs);
+    Collection<MetaDataVersion> persistConfigurations(T globalRuleConfigs);
 
     /**
      * Load configurations.

diff --git a/...pache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java b/...pache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
@@ -62,7 +62,7 @@ public void persist(final Collection<RuleConfiguration> globalRuleConfigs) {
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
-    public Collection<MetaDataVersion> persistConfig(final Collection<RuleConfiguration> globalRuleConfigs) {
+    public Collection<MetaDataVersion> persistConfigurations(final Collection<RuleConfiguration> globalRuleConfigs) {
         Collection<MetaDataVersion> result = new LinkedList<>();
         Map<RuleConfiguration, YamlDataNodeGlobalRuleConfigurationSwapper> yamlConfigs = new YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(globalRuleConfigs);
         for (Entry<RuleConfiguration, YamlDataNodeGlobalRuleConfigurationSwapper> entry : yamlConfigs.entrySet()) {

diff --git a/...pache/shardingsphere/metadata/persist/service/config/global/PropertiesPersistService.java b/...pache/shardingsphere/metadata/persist/service/config/global/PropertiesPersistService.java
@@ -52,7 +52,7 @@ public void persist(final Properties props) {
     }
 
     @Override
-    public Collection<MetaDataVersion> persistConfig(final Properties props) {
+    public Collection<MetaDataVersion> persistConfigurations(final Properties props) {
         List<String> versions = repository.getChildrenKeys(GlobalNode.getPropsVersionsNode());
         String nextActiveVersion = versions.isEmpty() ? DEFAULT_VERSION : String.valueOf(Integer.parseInt(versions.get(0)) + 1);
         String persistKey = GlobalNode.getPropsVersionNode(nextActiveVersion);

diff --git a/...c/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java b/...c/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -149,12 +149,13 @@ public void removeRuleConfiguration(final String databaseName, final String rule
     @Override
     public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRuleConfig) {
         GlobalPersistService<Collection<RuleConfiguration>> globalRuleService = contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService();
-        contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(globalRuleService.persistConfig(Collections.singleton(toBeAlteredRuleConfig)));
+        contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService()
+                .switchActiveVersion(globalRuleService.persistConfigurations(Collections.singleton(toBeAlteredRuleConfig)));
     }
 
     @Override
     public void alterProperties(final Properties props) {
-        Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfig(props);
+        Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfigurations(props);
         contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(versions);
     }
 

diff --git a/.../java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java b/.../java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -306,15 +306,16 @@ public void removeRuleConfiguration(final String databaseName, final String rule
     public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRuleConfig) {
         contextManager.getConfigurationContextManager().alterGlobalRuleConfiguration(toBeAlteredRuleConfig);
         GlobalPersistService<Collection<RuleConfiguration>> globalRuleService = contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService();
-        contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(globalRuleService.persistConfig(Collections.singleton(toBeAlteredRuleConfig)));
+        contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService()
+                .switchActiveVersion(globalRuleService.persistConfigurations(Collections.singleton(toBeAlteredRuleConfig)));
         clearServiceCache();
     }
 
     @Override
     public void alterProperties(final Properties props) {
         contextManager.getConfigurationContextManager().alterProperties(props);
         if (null != contextManager.getMetaDataContexts().getPersistService().getPropsService()) {
-            Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfig(props);
+            Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfigurations(props);
             contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(versions);
         }
         clearServiceCache();