You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/06/29 16:17:15 UTC
[shardingsphere] branch master updated: Rename ShardingRuleConfiguration.shardingAudits to auditStrategies (#18711)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 0d96c833a81 Rename ShardingRuleConfiguration.shardingAudits to auditStrategies (#18711)
0d96c833a81 is described below
commit 0d96c833a8190fffe4687f48598b4e3cadae7d82
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 30 00:17:09 2022 +0800
Rename ShardingRuleConfiguration.shardingAudits to auditStrategies (#18711)
---
.../api/config/ShardingRuleConfiguration.java | 6 +--
.../audit/ShardingAuditStrategyConfiguration.java | 8 ++--
.../factory/ShardingAuditAlgorithmFactory.java | 6 +--
...AlgorithmProvidedShardingRuleConfiguration.java | 6 +--
.../checker/audit/ShardingAuditChecker.java | 6 +--
.../sharding/constant/ShardingOrder.java | 5 --
.../shardingsphere/sharding/rule/ShardingRule.java | 12 ++---
.../yaml/config/YamlShardingRuleConfiguration.java | 6 +--
.../YamlShardingAuditStrategyConfiguration.java | 2 +-
...eAlgorithmProviderConfigurationYamlSwapper.java | 56 +++++++++++-----------
.../ShardingRuleConfigurationYamlSwapper.java | 10 ++--
...rdingAuditStrategyConfigurationYamlSwapper.java | 4 +-
12 files changed, 61 insertions(+), 66 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/ShardingRuleConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/ShardingRuleConfiguration.java
index 8e35e213c98..2c207ceee34 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/ShardingRuleConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/ShardingRuleConfiguration.java
@@ -57,15 +57,15 @@ public final class ShardingRuleConfiguration implements DatabaseRuleConfiguratio
private String defaultShardingColumn;
+ private Map<String, ShardingAuditStrategyConfiguration> auditStrategies = new LinkedHashMap<>();
+
private Map<String, ShardingSphereAlgorithmConfiguration> shardingAlgorithms = new LinkedHashMap<>();
private Map<String, ShardingSphereAlgorithmConfiguration> keyGenerators = new LinkedHashMap<>();
- private Map<String, ShardingSphereAlgorithmConfiguration> shardingAuditAlgorithms = new LinkedHashMap<>();
+ private Map<String, ShardingSphereAlgorithmConfiguration> auditAlgorithms = new LinkedHashMap<>();
private String scalingName;
private Map<String, OnRuleAlteredActionConfiguration> scaling = new LinkedHashMap<>();
-
- private Map<String, ShardingAuditStrategyConfiguration> shardingAudits = new LinkedHashMap<>();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/audit/ShardingAuditStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/audit/ShardingAuditStrategyConfiguration.java
index 45bd1d4239e..55c42768c4b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/audit/ShardingAuditStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/audit/ShardingAuditStrategyConfiguration.java
@@ -26,13 +26,13 @@ import lombok.Getter;
@Getter
public final class ShardingAuditStrategyConfiguration {
- private final String shardingAuditAlgorithmName;
+ private final String auditAlgorithmName;
private final boolean allowHintDisable;
- public ShardingAuditStrategyConfiguration(final String shardingAuditAlgorithmName, final boolean allowHintDisable) {
- Preconditions.checkNotNull(shardingAuditAlgorithmName, "Sharding algorithm name is required.");
- this.shardingAuditAlgorithmName = shardingAuditAlgorithmName;
+ public ShardingAuditStrategyConfiguration(final String auditAlgorithmName, final boolean allowHintDisable) {
+ Preconditions.checkNotNull(auditAlgorithmName, "Sharding audit algorithm name is required.");
+ this.auditAlgorithmName = auditAlgorithmName;
this.allowHintDisable = allowHintDisable;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactory.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactory.java
index 3d852d81d3d..da755f3ecaf 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactory.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactory.java
@@ -29,16 +29,16 @@ import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
* Sharding audit algorithm factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ShardingAuditAlgorithmFactory {
+public final class ShardingAuditAlgorithmFactory {
static {
ShardingSphereServiceLoader.register(ShardingAuditAlgorithm.class);
}
/**
- * Create new instance of sharding audit check algorithm.
+ * Create new instance of sharding audit algorithm.
*
- * @param shardingAuditAlgorithmConfig sharding algorithm configuration
+ * @param shardingAuditAlgorithmConfig sharding audit algorithm configuration
* @return created instance
*/
public static ShardingAuditAlgorithm newInstance(final ShardingSphereAlgorithmConfiguration shardingAuditAlgorithmConfig) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/config/AlgorithmProvidedShardingRuleConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/config/AlgorithmProvidedShardingRuleConfiguration.java
index ba6906ba542..a20b4684f9b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/config/AlgorithmProvidedShardingRuleConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/config/AlgorithmProvidedShardingRuleConfiguration.java
@@ -58,11 +58,11 @@ public final class AlgorithmProvidedShardingRuleConfiguration implements Databas
private String defaultShardingColumn;
+ private Map<String, ShardingAuditStrategyConfiguration> auditStrategies = new LinkedHashMap<>();
+
private Map<String, ShardingAlgorithm> shardingAlgorithms = new LinkedHashMap<>();
private Map<String, KeyGenerateAlgorithm> keyGenerators = new LinkedHashMap<>();
- private Map<String, ShardingAuditAlgorithm> shardingAuditAlgorithms = new LinkedHashMap<>();
-
- private Map<String, ShardingAuditStrategyConfiguration> shardingAudits = new LinkedHashMap<>();
+ private Map<String, ShardingAuditAlgorithm> auditAlgorithms = new LinkedHashMap<>();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java
index f1ac351996a..465e60bd1d7 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java
@@ -44,8 +44,8 @@ public final class ShardingAuditChecker implements SQLChecker<ShardingRule> {
@Override
public SQLCheckResult check(final SQLStatement sqlStatement, final List<Object> parameters, final Grantee grantee,
final String currentDatabase, final Map<String, ShardingSphereDatabase> databases, final ShardingRule rule) {
- for (Entry<String, ShardingAuditStrategyConfiguration> entry : rule.getShardingAudits().entrySet()) {
- SQLCheckResult result = rule.getShardingAuditAlgorithms().get(entry.getValue().getShardingAuditAlgorithmName()).check(sqlStatement, parameters, grantee, currentDatabase, databases, rule);
+ for (Entry<String, ShardingAuditStrategyConfiguration> entry : rule.getAuditStrategies().entrySet()) {
+ SQLCheckResult result = rule.getShardingAuditAlgorithms().get(entry.getValue().getAuditAlgorithmName()).check(sqlStatement, parameters, grantee, currentDatabase, databases, rule);
if (!result.isPassed()) {
return result;
}
@@ -65,7 +65,7 @@ public final class ShardingAuditChecker implements SQLChecker<ShardingRule> {
@Override
public int getOrder() {
- return ShardingOrder.AUDIT_ORDER;
+ return ShardingOrder.ORDER;
}
@Override
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
index 38fac1b81a3..22acab09d77 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
@@ -35,9 +35,4 @@ public final class ShardingOrder {
* Algorithm provider sharding order.
*/
public static final int ALGORITHM_PROVIDER_ORDER = ORDER + 1;
-
- /**
- * Sharding audit order.
- */
- public static final int AUDIT_ORDER = 1000;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index 2affa1e4313..c87cc2ff8c2 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -113,14 +113,14 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
private final Map<String, Collection<DataNode>> shardingTableDataNodes;
- private final Map<String, ShardingAuditStrategyConfiguration> shardingAudits;
+ private final Map<String, ShardingAuditStrategyConfiguration> auditStrategies;
public ShardingRule(final ShardingRuleConfiguration config, final Collection<String> dataSourceNames) {
configuration = config;
this.dataSourceNames = getDataSourceNames(config.getTables(), config.getAutoTables(), dataSourceNames);
config.getShardingAlgorithms().forEach((key, value) -> shardingAlgorithms.put(key, createShardingAlgorithm(key, value, config.getTables(), config.getAutoTables())));
config.getKeyGenerators().forEach((key, value) -> keyGenerators.put(key, KeyGenerateAlgorithmFactory.newInstance(value)));
- config.getShardingAuditAlgorithms().forEach((key, value) -> shardingAuditAlgorithms.put(key, ShardingAuditAlgorithmFactory.newInstance(value)));
+ config.getAuditAlgorithms().forEach((key, value) -> shardingAuditAlgorithms.put(key, ShardingAuditAlgorithmFactory.newInstance(value)));
tableRules.putAll(createTableRules(config.getTables(), config.getDefaultKeyGenerateStrategy()));
tableRules.putAll(createAutoTableRules(config.getAutoTables(), config.getDefaultKeyGenerateStrategy()));
broadcastTables = createBroadcastTables(config.getBroadcastTables());
@@ -132,7 +132,7 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
: keyGenerators.get(config.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
defaultShardingColumn = config.getDefaultShardingColumn();
shardingTableDataNodes = createShardingTableDataNodes(tableRules);
- shardingAudits = createShardingAudits(config.getShardingAudits());
+ auditStrategies = createShardingAudits(config.getAuditStrategies());
Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, config.getBindingTableGroups(),
broadcastTables, defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig, defaultShardingColumn)),
"Invalid binding table configuration in ShardingRuleConfiguration.");
@@ -143,7 +143,7 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
this.dataSourceNames = getDataSourceNames(config.getTables(), config.getAutoTables(), dataSourceNames);
shardingAlgorithms.putAll(config.getShardingAlgorithms());
keyGenerators.putAll(config.getKeyGenerators());
- shardingAuditAlgorithms.putAll(config.getShardingAuditAlgorithms());
+ shardingAuditAlgorithms.putAll(config.getAuditAlgorithms());
tableRules.putAll(createTableRules(config.getTables(), config.getDefaultKeyGenerateStrategy()));
tableRules.putAll(createAutoTableRules(config.getAutoTables(), config.getDefaultKeyGenerateStrategy()));
broadcastTables = createBroadcastTables(config.getBroadcastTables());
@@ -155,7 +155,7 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
: keyGenerators.get(config.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
defaultShardingColumn = config.getDefaultShardingColumn();
shardingTableDataNodes = createShardingTableDataNodes(tableRules);
- shardingAudits = createShardingAudits(config.getShardingAudits());
+ auditStrategies = createShardingAudits(config.getAuditStrategies());
Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, config.getBindingTableGroups(),
broadcastTables, defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig, defaultShardingColumn)),
"Invalid binding table configuration in ShardingRuleConfiguration.");
@@ -173,7 +173,7 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
if (null == shardingAudits) {
return new LinkedHashMap<>(0, 1);
}
- Preconditions.checkArgument(shardingAudits.values().stream().allMatch(each -> shardingAuditAlgorithms.containsKey(each.getShardingAuditAlgorithmName())),
+ Preconditions.checkArgument(shardingAudits.values().stream().allMatch(each -> shardingAuditAlgorithms.containsKey(each.getAuditAlgorithmName())),
"Cannot find sharding audit algorithm");
return shardingAudits;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/YamlShardingRuleConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/YamlShardingRuleConfiguration.java
index 367e79d28d4..b8a95a0ae95 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/YamlShardingRuleConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/YamlShardingRuleConfiguration.java
@@ -55,11 +55,13 @@ public final class YamlShardingRuleConfiguration implements YamlRuleConfiguratio
private YamlKeyGenerateStrategyConfiguration defaultKeyGenerateStrategy;
+ private Map<String, YamlShardingAuditStrategyConfiguration> auditStrategies = new LinkedHashMap<>();
+
private Map<String, YamlShardingSphereAlgorithmConfiguration> shardingAlgorithms = new LinkedHashMap<>();
private Map<String, YamlShardingSphereAlgorithmConfiguration> keyGenerators = new LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration> shardingAuditAlgorithms = new LinkedHashMap<>();
+ private Map<String, YamlShardingSphereAlgorithmConfiguration> auditAlgorithms = new LinkedHashMap<>();
private String defaultShardingColumn;
@@ -67,8 +69,6 @@ public final class YamlShardingRuleConfiguration implements YamlRuleConfiguratio
private Map<String, YamlOnRuleAlteredActionConfiguration> scaling = new LinkedHashMap<>();
- private Map<String, YamlShardingAuditStrategyConfiguration> shardingAudits = new LinkedHashMap<>();
-
@Override
public Class<ShardingRuleConfiguration> getRuleConfigurationType() {
return ShardingRuleConfiguration.class;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/strategy/audit/YamlShardingAuditStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/strategy/audit/YamlShardingAuditStrategyConfiguration.java
index d259b8bf42d..3775fd093df 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/strategy/audit/YamlShardingAuditStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/config/strategy/audit/YamlShardingAuditStrategyConfiguration.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.yaml.config.pojo.YamlConfiguration;
@Setter
public final class YamlShardingAuditStrategyConfiguration implements YamlConfiguration {
- private String shardingAuditAlgorithmName;
+ private String auditAlgorithmName;
private boolean allowHintDisable;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java
index b49c2e10adc..db329c09798 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -44,7 +44,7 @@ public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
private final KeyGenerateStrategyConfigurationYamlSwapper keyGenerateStrategyYamlSwapper = new KeyGenerateStrategyConfigurationYamlSwapper();
- private final ShardingAuditStrategyConfigurationYamlSwapper shardingAuditStrategyYamlSwapper = new ShardingAuditStrategyConfigurationYamlSwapper();
+ private final ShardingAuditStrategyConfigurationYamlSwapper auditStrategyYamlSwapper = new ShardingAuditStrategyConfigurationYamlSwapper();
@Override
public YamlShardingRuleConfiguration swapToYamlConfiguration(final AlgorithmProvidedShardingRuleConfiguration data) {
@@ -56,10 +56,35 @@ public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
result.getBroadcastTables().addAll(data.getBroadcastTables());
setYamlDefaultStrategies(data, result);
setYamlAlgorithms(data, result);
- data.getShardingAudits().forEach((key, value) -> result.getShardingAudits().put(key, shardingAuditStrategyYamlSwapper.swapToYamlConfiguration(value)));
+ data.getAuditStrategies().forEach((key, value) -> result.getAuditStrategies().put(key, auditStrategyYamlSwapper.swapToYamlConfiguration(value)));
return result;
}
+ private void setYamlDefaultStrategies(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
+ if (null != data.getDefaultDatabaseShardingStrategy()) {
+ yamlConfig.setDefaultDatabaseStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultDatabaseShardingStrategy()));
+ }
+ if (null != data.getDefaultTableShardingStrategy()) {
+ yamlConfig.setDefaultTableStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultTableShardingStrategy()));
+ }
+ if (null != data.getDefaultKeyGenerateStrategy()) {
+ yamlConfig.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultKeyGenerateStrategy()));
+ }
+ }
+
+ private void setYamlAlgorithms(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
+ if (null != data.getShardingAlgorithms()) {
+ data.getShardingAlgorithms().forEach((key, value) -> yamlConfig.getShardingAlgorithms().put(key, new YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ }
+ if (null != data.getKeyGenerators()) {
+ data.getKeyGenerators().forEach((key, value) -> yamlConfig.getKeyGenerators().put(key, new YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ }
+ if (null != data.getAuditAlgorithms()) {
+ data.getAuditAlgorithms().forEach(
+ (key, value) -> yamlConfig.getAuditAlgorithms().put(key, new YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ }
+ }
+
@Override
public AlgorithmProvidedShardingRuleConfiguration swapToObject(final YamlShardingRuleConfiguration yamlConfig) {
AlgorithmProvidedShardingRuleConfiguration result = new AlgorithmProvidedShardingRuleConfiguration();
@@ -77,7 +102,7 @@ public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
result.getBroadcastTables().addAll(yamlConfig.getBroadcastTables());
setDefaultStrategies(yamlConfig, result);
result.setDefaultShardingColumn(yamlConfig.getDefaultShardingColumn());
- yamlConfig.getShardingAudits().forEach((key, value) -> result.getShardingAudits().put(key, shardingAuditStrategyYamlSwapper.swapToObject(value)));
+ yamlConfig.getAuditStrategies().forEach((key, value) -> result.getAuditStrategies().put(key, auditStrategyYamlSwapper.swapToObject(value)));
return result;
}
@@ -107,29 +132,4 @@ public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
public int getOrder() {
return ShardingOrder.ALGORITHM_PROVIDER_ORDER;
}
-
- private void setYamlDefaultStrategies(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
- if (null != data.getDefaultDatabaseShardingStrategy()) {
- yamlConfig.setDefaultDatabaseStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultDatabaseShardingStrategy()));
- }
- if (null != data.getDefaultTableShardingStrategy()) {
- yamlConfig.setDefaultTableStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultTableShardingStrategy()));
- }
- if (null != data.getDefaultKeyGenerateStrategy()) {
- yamlConfig.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultKeyGenerateStrategy()));
- }
- }
-
- private void setYamlAlgorithms(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
- if (null != data.getShardingAlgorithms()) {
- data.getShardingAlgorithms().forEach((key, value) -> yamlConfig.getShardingAlgorithms().put(key, new YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
- }
- if (null != data.getKeyGenerators()) {
- data.getKeyGenerators().forEach((key, value) -> yamlConfig.getKeyGenerators().put(key, new YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
- }
- if (null != data.getShardingAuditAlgorithms()) {
- data.getShardingAuditAlgorithms().forEach(
- (key, value) -> yamlConfig.getShardingAuditAlgorithms().put(key, new YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
- }
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java
index 8b98bcae98e..1edeef1ef51 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java
@@ -49,7 +49,7 @@ public final class ShardingRuleConfigurationYamlSwapper implements YamlRuleConfi
private final OnRuleAlteredActionConfigurationYamlSwapper onRuleAlteredActionYamlSwapper = new OnRuleAlteredActionConfigurationYamlSwapper();
- private final ShardingAuditStrategyConfigurationYamlSwapper shardingAuditStrategyYamlSwapper = new ShardingAuditStrategyConfigurationYamlSwapper();
+ private final ShardingAuditStrategyConfigurationYamlSwapper auditStrategyYamlSwapper = new ShardingAuditStrategyConfigurationYamlSwapper();
@Override
public YamlShardingRuleConfiguration swapToYamlConfiguration(final ShardingRuleConfiguration data) {
@@ -63,7 +63,7 @@ public final class ShardingRuleConfigurationYamlSwapper implements YamlRuleConfi
setYamlAlgorithms(data, result);
result.setDefaultShardingColumn(data.getDefaultShardingColumn());
result.setScalingName(data.getScalingName());
- data.getShardingAudits().forEach((key, value) -> result.getShardingAudits().put(key, shardingAuditStrategyYamlSwapper.swapToYamlConfiguration(value)));
+ data.getAuditStrategies().forEach((key, value) -> result.getAuditStrategies().put(key, auditStrategyYamlSwapper.swapToYamlConfiguration(value)));
return result;
}
@@ -110,7 +110,7 @@ public final class ShardingRuleConfigurationYamlSwapper implements YamlRuleConfi
setAlgorithms(yamlConfig, result);
result.setDefaultShardingColumn(yamlConfig.getDefaultShardingColumn());
result.setScalingName(yamlConfig.getScalingName());
- yamlConfig.getShardingAudits().forEach((key, value) -> result.getShardingAudits().put(key, shardingAuditStrategyYamlSwapper.swapToObject(value)));
+ yamlConfig.getAuditStrategies().forEach((key, value) -> result.getAuditStrategies().put(key, auditStrategyYamlSwapper.swapToObject(value)));
return result;
}
@@ -133,8 +133,8 @@ public final class ShardingRuleConfigurationYamlSwapper implements YamlRuleConfi
if (null != yamlConfig.getKeyGenerators()) {
yamlConfig.getKeyGenerators().forEach((key, value) -> ruleConfig.getKeyGenerators().put(key, algorithmSwapper.swapToObject(value)));
}
- if (null != yamlConfig.getShardingAuditAlgorithms()) {
- yamlConfig.getShardingAuditAlgorithms().forEach((key, value) -> ruleConfig.getShardingAuditAlgorithms().put(key, algorithmSwapper.swapToObject(value)));
+ if (null != yamlConfig.getAuditAlgorithms()) {
+ yamlConfig.getAuditAlgorithms().forEach((key, value) -> ruleConfig.getAuditAlgorithms().put(key, algorithmSwapper.swapToObject(value)));
}
if (null != yamlConfig.getScaling()) {
yamlConfig.getScaling().forEach((key, value) -> ruleConfig.getScaling().put(key, onRuleAlteredActionYamlSwapper.swapToObject(value)));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingAuditStrategyConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingAuditStrategyConfigurationYamlSwapper.java
index 7ed1d7ac782..5a6b975fba6 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingAuditStrategyConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingAuditStrategyConfigurationYamlSwapper.java
@@ -29,13 +29,13 @@ public final class ShardingAuditStrategyConfigurationYamlSwapper implements Yaml
@Override
public YamlShardingAuditStrategyConfiguration swapToYamlConfiguration(final ShardingAuditStrategyConfiguration data) {
YamlShardingAuditStrategyConfiguration result = new YamlShardingAuditStrategyConfiguration();
- result.setShardingAuditAlgorithmName(data.getShardingAuditAlgorithmName());
+ result.setAuditAlgorithmName(data.getAuditAlgorithmName());
result.setAllowHintDisable(data.isAllowHintDisable());
return result;
}
@Override
public ShardingAuditStrategyConfiguration swapToObject(final YamlShardingAuditStrategyConfiguration yamlConfig) {
- return new ShardingAuditStrategyConfiguration(yamlConfig.getShardingAuditAlgorithmName(), yamlConfig.isAllowHintDisable());
+ return new ShardingAuditStrategyConfiguration(yamlConfig.getAuditAlgorithmName(), yamlConfig.isAllowHintDisable());
}
}