This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 37c9d9ea4a2 Refactor DatabaseBasedPersistService (#31034)
37c9d9ea4a2 is described below
commit 37c9d9ea4a2d5799a59b8c2f394e7b1d8c31a515
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Apr 27 19:41:02 2024 +0800
Refactor DatabaseBasedPersistService (#31034)
* Refactor DatabaseBasedPersistService
* Refactor DatabaseBasedPersistService
* Refactor DatabaseBasedPersistService
* Refactor DatabaseBasedPersistService
---
.../config/database/DatabaseBasedPersistService.java | 8 ++++----
.../datasource/DataSourceNodePersistService.java | 4 ++--
.../datasource/DataSourceUnitPersistService.java | 4 ++--
.../database/rule/DatabaseRulePersistService.java | 18 +++++++-----------
.../config/global/GlobalRulePersistService.java | 17 ++++++++---------
.../manager/context/ConfigurationContextManager.java | 5 ++---
.../manager/cluster/ClusterModeContextManager.java | 12 ++++++------
.../standalone/StandaloneModeContextManager.java | 10 +++++-----
8 files changed, 36 insertions(+), 42 deletions(-)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
index 0232d5a79fa..f9b7840449d 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseBasedPersistService.java
@@ -67,17 +67,17 @@ public interface DatabaseBasedPersistService<T> {
* Delete configurations.
*
* @param databaseName database name
- * @param configs configurations
+ * @param configs to be deleted configurations
* @return meta data versions
*/
- Collection<MetaDataVersion> deleteConfig(String databaseName, T configs);
+ Collection<MetaDataVersion> deleteConfigurations(String databaseName, T
configs);
/**
* Persist configurations.
*
* @param databaseName database name
- * @param configs configurations
+ * @param configs to be persisted configurations
* @return meta data versions
*/
- Collection<MetaDataVersion> persistConfig(String databaseName, T configs);
+ Collection<MetaDataVersion> persistConfigurations(String databaseName, T
configs);
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceNodePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceNodePersistService.java
index 62502f8bfca..370c8501793 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceNodePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceNodePersistService.java
@@ -88,7 +88,7 @@ public final class DataSourceNodePersistService implements
DatabaseBasedPersistS
}
@Override
- public Collection<MetaDataVersion> deleteConfig(final String databaseName,
final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
+ public Collection<MetaDataVersion> deleteConfigurations(final String
databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (Entry<String, DataSourcePoolProperties> entry :
dataSourceConfigs.entrySet()) {
String delKey =
DataSourceMetaDataNode.getDataSourceNodeNode(databaseName, entry.getKey());
@@ -99,7 +99,7 @@ public final class DataSourceNodePersistService implements
DatabaseBasedPersistS
}
@Override
- public Collection<MetaDataVersion> persistConfig(final String
databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
+ public Collection<MetaDataVersion> persistConfigurations(final String
databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (Entry<String, DataSourcePoolProperties> entry :
dataSourceConfigs.entrySet()) {
List<String> versions =
repository.getChildrenKeys(DataSourceMetaDataNode.getDataSourceNodeVersionsNode(databaseName,
entry.getKey()));
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceUnitPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceUnitPersistService.java
index 26dcd9879f4..b18ab364fca 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceUnitPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/datasource/DataSourceUnitPersistService.java
@@ -88,7 +88,7 @@ public final class DataSourceUnitPersistService implements
DatabaseBasedPersistS
}
@Override
- public Collection<MetaDataVersion> deleteConfig(final String databaseName,
final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
+ public Collection<MetaDataVersion> deleteConfigurations(final String
databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (Entry<String, DataSourcePoolProperties> entry :
dataSourceConfigs.entrySet()) {
String delKey =
DataSourceMetaDataNode.getDataSourceUnitNode(databaseName, entry.getKey());
@@ -99,7 +99,7 @@ public final class DataSourceUnitPersistService implements
DatabaseBasedPersistS
}
@Override
- public Collection<MetaDataVersion> persistConfig(final String
databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
+ public Collection<MetaDataVersion> persistConfigurations(final String
databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (Entry<String, DataSourcePoolProperties> entry :
dataSourceConfigs.entrySet()) {
List<String> versions =
repository.getChildrenKeys(DataSourceMetaDataNode.getDataSourceUnitVersionsNode(databaseName,
entry.getKey()));
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
index 6bc5ef3ae37..3316d2e60ca 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/rule/DatabaseRulePersistService.java
@@ -32,7 +32,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
/**
@@ -52,8 +51,7 @@ public final class DatabaseRulePersistService extends
AbstractPersistService imp
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
public void persist(final String databaseName, final
Collection<RuleConfiguration> configs) {
- Map<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
yamlConfigs = new
YamlDataNodeRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs);
- for (Entry<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
entry : yamlConfigs.entrySet()) {
+ for (Entry<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
entry : new
YamlDataNodeRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs).entrySet())
{
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(entry.getKey());
if (!repositoryTuples.isEmpty()) {
persistDataNodes(databaseName,
entry.getValue().getRuleTagName().toLowerCase(), repositoryTuples);
@@ -63,8 +61,8 @@ public final class DatabaseRulePersistService extends
AbstractPersistService imp
@Override
public Collection<RuleConfiguration> load(final String databaseName) {
- Collection<RepositoryTuple> repositoryTuple =
getRepositoryTuple(DatabaseRuleMetaDataNode.getRulesNode(databaseName));
- return repositoryTuple.isEmpty() ? Collections.emptyList() : new
YamlDataNodeRuleConfigurationSwapperEngine().swapToRuleConfigurations(repositoryTuple);
+ Collection<RepositoryTuple> repositoryTuples =
getRepositoryTuple(DatabaseRuleMetaDataNode.getRulesNode(databaseName));
+ return repositoryTuples.isEmpty() ? Collections.emptyList() : new
YamlDataNodeRuleConfigurationSwapperEngine().swapToRuleConfigurations(repositoryTuples);
}
@Override
@@ -74,10 +72,9 @@ public final class DatabaseRulePersistService extends
AbstractPersistService imp
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
- public Collection<MetaDataVersion> persistConfig(final String
databaseName, final Collection<RuleConfiguration> configs) {
+ public Collection<MetaDataVersion> persistConfigurations(final String
databaseName, final Collection<RuleConfiguration> configs) {
Collection<MetaDataVersion> result = new LinkedList<>();
- Map<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
yamlConfigs = new
YamlDataNodeRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs);
- for (Entry<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
entry : yamlConfigs.entrySet()) {
+ for (Entry<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
entry : new
YamlDataNodeRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs).entrySet())
{
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(entry.getKey());
if (!repositoryTuples.isEmpty()) {
result.addAll(persistDataNodes(databaseName,
entry.getValue().getRuleTagName().toLowerCase(), repositoryTuples));
@@ -102,10 +99,9 @@ public final class DatabaseRulePersistService extends
AbstractPersistService imp
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
- public Collection<MetaDataVersion> deleteConfig(final String databaseName,
final Collection<RuleConfiguration> configs) {
+ public Collection<MetaDataVersion> deleteConfigurations(final String
databaseName, final Collection<RuleConfiguration> configs) {
Collection<MetaDataVersion> result = new LinkedList<>();
- Map<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
yamlConfigs = new
YamlDataNodeRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs);
- for (Entry<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
entry : yamlConfigs.entrySet()) {
+ for (Entry<RuleConfiguration, YamlDataNodeRuleConfigurationSwapper>
entry : new
YamlDataNodeRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(configs).entrySet())
{
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(entry.getKey());
if (repositoryTuples.isEmpty()) {
continue;
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
index 157af02fb39..514670167d1 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
@@ -31,7 +31,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
/**
@@ -51,8 +50,8 @@ public final class GlobalRulePersistService extends
AbstractPersistService imple
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
public void persist(final Collection<RuleConfiguration> globalRuleConfigs)
{
- Map<RuleConfiguration, YamlDataNodeGlobalRuleConfigurationSwapper>
yamlConfigs = new
YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(globalRuleConfigs);
- for (Entry<RuleConfiguration,
YamlDataNodeGlobalRuleConfigurationSwapper> entry : yamlConfigs.entrySet()) {
+ for (Entry<RuleConfiguration,
YamlDataNodeGlobalRuleConfigurationSwapper> entry : new
YamlDataNodeGlobalRuleConfigurationSwapperEngine()
+ .swapToYamlRuleConfigurations(globalRuleConfigs).entrySet()) {
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(entry.getKey());
if (!repositoryTuples.isEmpty()) {
persistDataNodes(repositoryTuples);
@@ -64,8 +63,8 @@ public final class GlobalRulePersistService extends
AbstractPersistService imple
@Override
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()) {
+ for (Entry<RuleConfiguration,
YamlDataNodeGlobalRuleConfigurationSwapper> entry : new
YamlDataNodeGlobalRuleConfigurationSwapperEngine()
+ .swapToYamlRuleConfigurations(globalRuleConfigs).entrySet()) {
Collection<RepositoryTuple> repositoryTuples =
entry.getValue().swapToRepositoryTuples(entry.getKey());
if (!repositoryTuples.isEmpty()) {
result.addAll(persistDataNodes(repositoryTuples));
@@ -91,13 +90,13 @@ public final class GlobalRulePersistService extends
AbstractPersistService imple
@Override
public Collection<RuleConfiguration> load() {
- Collection<RepositoryTuple> repositoryTuple =
getRepositoryTuple(GlobalNode.getGlobalRuleRootNode());
- return repositoryTuple.isEmpty() ? Collections.emptyList() : new
YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapToRuleConfigurations(repositoryTuple);
+ Collection<RepositoryTuple> repositoryTuples =
getRepositoryTuple(GlobalNode.getGlobalRuleRootNode());
+ return repositoryTuples.isEmpty() ? Collections.emptyList() : new
YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapToRuleConfigurations(repositoryTuples);
}
@Override
public RuleConfiguration load(final String ruleName) {
- Collection<RepositoryTuple> repositoryTuple =
getRepositoryTuple(GlobalNode.getGlobalRuleNode(ruleName));
- return new
YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapSingleRuleToRuleConfiguration(ruleName,
repositoryTuple).orElse(null);
+ Collection<RepositoryTuple> repositoryTuples =
getRepositoryTuple(GlobalNode.getGlobalRuleNode(ruleName));
+ return new
YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapSingleRuleToRuleConfiguration(ruleName,
repositoryTuples).orElse(null);
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
index 8f281988218..55364ba0489 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
@@ -376,9 +376,8 @@ public final class ConfigurationContextManager {
@SuppressWarnings("rawtypes")
@SneakyThrows(Exception.class)
private void closeStaleTransactionRule(final RuleConfiguration ruleConfig)
{
- Map<RuleConfiguration, YamlDataNodeGlobalRuleConfigurationSwapper>
yamlConfigs =
- new
YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(Collections.singletonList(ruleConfig));
- for (Entry<RuleConfiguration,
YamlDataNodeGlobalRuleConfigurationSwapper> entry : yamlConfigs.entrySet()) {
+ for (Entry<RuleConfiguration,
YamlDataNodeGlobalRuleConfigurationSwapper> entry : new
YamlDataNodeGlobalRuleConfigurationSwapperEngine()
+
.swapToYamlRuleConfigurations(Collections.singleton(ruleConfig)).entrySet()) {
if
("transaction".equalsIgnoreCase(entry.getValue().getRuleTagName())) {
Optional<TransactionRule> transactionRule =
metaDataContexts.get().getMetaData().getGlobalRuleMetaData().findSingleRule(TransactionRule.class);
if (!transactionRule.isPresent()) {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
index 0163709741c..c3d212582ee 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -94,18 +94,18 @@ public final class ClusterModeContextManager implements
ModeContextManager, Cont
@Override
public void registerStorageUnits(final String databaseName, final
Map<String, DataSourcePoolProperties> toBeRegisteredProps) {
-
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().persistConfig(databaseName,
toBeRegisteredProps);
+
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().persistConfigurations(databaseName,
toBeRegisteredProps);
}
@Override
public void alterStorageUnits(final String databaseName, final Map<String,
DataSourcePoolProperties> toBeUpdatedProps) {
DatabaseBasedPersistService<Map<String, DataSourcePoolProperties>>
dataSourceService =
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService();
-
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(dataSourceService.persistConfig(databaseName,
toBeUpdatedProps));
+
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(dataSourceService.persistConfigurations(databaseName,
toBeUpdatedProps));
}
@Override
public void unregisterStorageUnits(final String databaseName, final
Collection<String> toBeDroppedStorageUnitNames) {
-
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().deleteConfig(databaseName,
+
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().deleteConfigurations(databaseName,
getToBeDroppedDataSourcePoolProperties(contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService().load(databaseName),
toBeDroppedStorageUnitNames));
}
@@ -123,13 +123,13 @@ public final class ClusterModeContextManager implements
ModeContextManager, Cont
public void alterSingleRuleConfiguration(final String databaseName, final
Collection<RuleConfiguration> ruleConfigs) {
ruleConfigs.removeIf(each ->
!each.getClass().isAssignableFrom(SingleRuleConfiguration.class));
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService()
-
.switchActiveVersion(contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().persistConfig(databaseName,
ruleConfigs));
+
.switchActiveVersion(contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().persistConfigurations(databaseName,
ruleConfigs));
}
@Override
public Collection<MetaDataVersion> alterRuleConfiguration(final String
databaseName, final RuleConfiguration toBeAlteredRuleConfig) {
if (null != toBeAlteredRuleConfig) {
- return
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().persistConfig(databaseName,
Collections.singleton(toBeAlteredRuleConfig));
+ return
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().persistConfigurations(databaseName,
Collections.singleton(toBeAlteredRuleConfig));
}
return Collections.emptyList();
}
@@ -137,7 +137,7 @@ public final class ClusterModeContextManager implements
ModeContextManager, Cont
@Override
public void removeRuleConfigurationItem(final String databaseName, final
RuleConfiguration toBeRemovedRuleConfig) {
if (null != toBeRemovedRuleConfig) {
-
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().deleteConfig(databaseName,
Collections.singleton(toBeRemovedRuleConfig));
+
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().deleteConfigurations(databaseName,
Collections.singleton(toBeRemovedRuleConfig));
}
}
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
index 71dd0d792cf..7748699c0d5 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -220,7 +220,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
.forEach((schemaName, schema) ->
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService()
.persistByAlterConfiguration(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(),
schemaName, schema));
DatabaseBasedPersistService<Map<String, DataSourcePoolProperties>>
dataSourceService =
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService();
-
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(dataSourceService.persistConfig(databaseName,
toBeRegisteredProps));
+
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(dataSourceService.persistConfigurations(databaseName,
toBeRegisteredProps));
clearServiceCache();
}
@@ -232,7 +232,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules()
.forEach(each -> ((GlobalRule)
each).refresh(contextManager.getMetaDataContexts().getMetaData().getDatabases(),
GlobalRuleChangedType.DATABASE_CHANGED));
DatabaseBasedPersistService<Map<String, DataSourcePoolProperties>>
dataSourceService =
contextManager.getMetaDataContexts().getPersistService().getDataSourceUnitService();
-
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(dataSourceService.persistConfig(databaseName,
toBeUpdatedProps));
+
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(dataSourceService.persistConfigurations(databaseName,
toBeUpdatedProps));
switchingResource.closeStaleDataSources();
clearServiceCache();
}
@@ -256,7 +256,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
public void alterSingleRuleConfiguration(final String databaseName, final
Collection<RuleConfiguration> ruleConfigs) {
ruleConfigs.removeIf(each ->
!each.getClass().isAssignableFrom(SingleRuleConfiguration.class));
Collection<MetaDataVersion> metaDataVersions =
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService()
-
.persistConfig(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(),
ruleConfigs);
+
.persistConfigurations(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(),
ruleConfigs);
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(metaDataVersions);
contextManager.getConfigurationContextManager().alterRuleConfiguration(databaseName,
ruleConfigs.iterator().next());
clearServiceCache();
@@ -266,7 +266,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
public Collection<MetaDataVersion> alterRuleConfiguration(final String
databaseName, final RuleConfiguration toBeAlteredRuleConfig) {
if (null != toBeAlteredRuleConfig) {
Collection<MetaDataVersion> metaDataVersions =
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService()
-
.persistConfig(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(),
Collections.singletonList(toBeAlteredRuleConfig));
+
.persistConfigurations(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(),
Collections.singletonList(toBeAlteredRuleConfig));
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(metaDataVersions);
sendDatabaseRuleChangedEvent(databaseName, metaDataVersions);
clearServiceCache();
@@ -291,7 +291,7 @@ public final class StandaloneModeContextManager implements
ModeContextManager, C
public void removeRuleConfigurationItem(final String databaseName, final
RuleConfiguration toBeRemovedRuleConfig) {
if (null != toBeRemovedRuleConfig) {
sendDatabaseRuleChangedEvent(databaseName,
-
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().deleteConfig(databaseName,
Collections.singleton(toBeRemovedRuleConfig)));
+
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().deleteConfigurations(databaseName,
Collections.singleton(toBeRemovedRuleConfig)));
clearServiceCache();
}
}
