This is an automated email from the ASF dual-hosted git repository.
panjuan 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 cd922050a4a Rename YamlAlgorithmConfiguration (#19793)
cd922050a4a is described below
commit cd922050a4a98f6991325d888c8230d2890be049
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 2 18:10:34 2022 +0800
Rename YamlAlgorithmConfiguration (#19793)
---
.../yaml/config/YamlDatabaseDiscoveryRuleConfiguration.java | 4 ++--
...scoveryRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
.../META-INF/additional-spring-configuration-metadata.json | 6 +++---
.../encrypt/yaml/config/YamlEncryptRuleConfiguration.java | 4 ++--
...EncryptRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
.../yaml/swapper/EncryptRuleConfigurationYamlSwapper.java | 4 ++--
...yptRuleAlgorithmProviderConfigurationYamlSwapperTest.java | 4 ++--
.../swapper/EncryptRuleConfigurationYamlSwapperTest.java | 4 ++--
.../META-INF/additional-spring-configuration-metadata.json | 6 +++---
.../yaml/config/YamlReadwriteSplittingRuleConfiguration.java | 4 ++--
...littingRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
.../META-INF/additional-spring-configuration-metadata.json | 6 +++---
.../shadow/yaml/config/YamlShadowRuleConfiguration.java | 4 ++--
.../ShadowRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
...dowRuleAlgorithmProviderConfigurationYamlSwapperTest.java | 4 ++--
.../META-INF/additional-spring-configuration-metadata.json | 6 +++---
.../sharding/yaml/config/YamlShardingRuleConfiguration.java | 8 ++++----
...hardingRuleAlgorithmProviderConfigurationYamlSwapper.java | 8 ++++----
.../META-INF/additional-spring-configuration-metadata.json | 12 ++++++------
...thmConfiguration.java => YamlAlgorithmConfiguration.java} | 4 ++--
.../pojo/rule/YamlOnRuleAlteredActionConfiguration.java | 12 ++++++------
.../ShardingSphereAlgorithmConfigurationYamlSwapper.java | 10 +++++-----
.../ShardingSphereAlgorithmConfigurationYamlSwapperTest.java | 6 +++---
.../OnRuleAlteredActionConfigurationYamlSwapperTest.java | 12 ++++++------
.../creator/ShardingSpherePipelineDataSourceCreator.java | 4 ++--
.../authority/yaml/config/YamlAuthorityConfiguration.java | 6 +++---
.../yaml/config/YamlAuthorityRuleConfiguration.java | 4 ++--
.../swapper/AuthorityRuleConfigurationYamlSwapperTest.java | 4 ++--
.../pipeline/scenario/rulealtered/RuleAlteredContext.java | 4 ++--
.../traffic/yaml/config/YamlTrafficRuleConfiguration.java | 6 +++---
.../swapper/TrafficRuleConfigurationYamlSwapperTest.java | 10 +++++-----
.../proxy/backend/config/ProxyConfigurationLoaderTest.java | 6 +++---
32 files changed, 94 insertions(+), 94 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/config/YamlDatabaseDiscoveryRuleConfiguration.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/config/YamlDatabaseDiscoveryRuleConfiguration.java
index c56f958a1a9..4d16704121f 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/config/YamlDatabaseDiscoveryRuleConfiguration.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/config/YamlDatabaseDiscoveryRuleConfiguration.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.dbdiscovery.api.config.DatabaseDiscoveryRuleCon
import
org.apache.shardingsphere.dbdiscovery.yaml.config.rule.YamlDatabaseDiscoveryDataSourceRuleConfiguration;
import
org.apache.shardingsphere.dbdiscovery.yaml.config.rule.YamlDatabaseDiscoveryHeartBeatConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -39,7 +39,7 @@ public final class YamlDatabaseDiscoveryRuleConfiguration
implements YamlRuleCon
private Map<String, YamlDatabaseDiscoveryHeartBeatConfiguration>
discoveryHeartbeats = new LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
discoveryTypes = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> discoveryTypes = new
LinkedHashMap<>();
@Override
public Class<DatabaseDiscoveryRuleConfiguration>
getRuleConfigurationType() {
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleAlgorithmProviderConfigurationYamlSwapper.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleAlgorithmProviderConfigurationYamlSwapper.java
index 7216977fbdf..7ed644ca477 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleAlgorithmProviderConfigurationYamlSwapper.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.dbdiscovery.constant.DatabaseDiscoveryOrder;
import
org.apache.shardingsphere.dbdiscovery.yaml.config.YamlDatabaseDiscoveryRuleConfiguration;
import
org.apache.shardingsphere.dbdiscovery.yaml.config.rule.YamlDatabaseDiscoveryDataSourceRuleConfiguration;
import
org.apache.shardingsphere.dbdiscovery.yaml.config.rule.YamlDatabaseDiscoveryHeartBeatConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper;
import java.util.Collection;
@@ -50,7 +50,7 @@ public final class
DatabaseDiscoveryRuleAlgorithmProviderConfigurationYamlSwappe
data.getDiscoveryHeartbeats().forEach((key, value) ->
result.getDiscoveryHeartbeats().put(key, swapToYamlConfiguration(value)));
}
if (null != data.getDiscoveryTypes()) {
- data.getDiscoveryTypes().forEach((key, value) ->
result.getDiscoveryTypes().put(key, new
YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ data.getDiscoveryTypes().forEach((key, value) ->
result.getDiscoveryTypes().put(key, new
YamlAlgorithmConfiguration(value.getType(), value.getProps())));
}
return result;
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index dee8c5c9842..e449aaf6045 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -34,7 +34,7 @@
},
{
"name": "spring.shardingsphere.rules.database-discovery.discovery-types",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.dbdiscovery.yaml.config.YamlDatabaseDiscoveryRuleConfiguration"
}
],
@@ -51,7 +51,7 @@
},
{
"name": "spring.shardingsphere.rules.database-discovery.discovery-types",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.dbdiscovery.yaml.config.YamlDatabaseDiscoveryRuleConfiguration"
}
],
@@ -87,7 +87,7 @@
{
"name": "handle-as",
"parameters": {
- "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration"
+ "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration"
}
}
]
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/YamlEncryptRuleConfiguration.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/YamlEncryptRuleConfiguration.java
index c0a4800bdb6..c1fd6ba5dd4 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/YamlEncryptRuleConfiguration.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/config/YamlEncryptRuleConfiguration.java
@@ -22,7 +22,7 @@ import lombok.Setter;
import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration;
import java.util.LinkedHashMap;
@@ -37,7 +37,7 @@ public final class YamlEncryptRuleConfiguration implements
YamlRuleConfiguration
private Map<String, YamlEncryptTableRuleConfiguration> tables = new
LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration> encryptors =
new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> encryptors = new
LinkedHashMap<>();
private boolean queryWithCipherColumn = true;
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapper.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapper.java
index 86f7f54f78c..8e4f305a6b3 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapper.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.encrypt.constant.EncryptOrder;
import
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleConfiguration;
import
org.apache.shardingsphere.encrypt.yaml.swapper.rule.EncryptTableRuleConfigurationYamlSwapper;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper;
import java.util.Collection;
@@ -41,7 +41,7 @@ public final class
EncryptRuleAlgorithmProviderConfigurationYamlSwapper implemen
public YamlEncryptRuleConfiguration swapToYamlConfiguration(final
AlgorithmProvidedEncryptRuleConfiguration data) {
YamlEncryptRuleConfiguration result = new
YamlEncryptRuleConfiguration();
data.getTables().forEach(each ->
result.getTables().put(each.getName(),
tableYamlSwapper.swapToYamlConfiguration(each)));
- data.getEncryptors().forEach((key, value) ->
result.getEncryptors().put(key, new
YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ data.getEncryptors().forEach((key, value) ->
result.getEncryptors().put(key, new YamlAlgorithmConfiguration(value.getType(),
value.getProps())));
result.setQueryWithCipherColumn(data.isQueryWithCipherColumn());
return result;
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapper.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapper.java
index ad15898cc8a..64d578ed9cc 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapper.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapper.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleCo
import
org.apache.shardingsphere.encrypt.yaml.swapper.rule.EncryptTableRuleConfigurationYamlSwapper;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.config.rule.rulealtered.OnRuleAlteredActionConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.ShardingSphereAlgorithmConfigurationYamlSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rulealtered.OnRuleAlteredActionConfigurationYamlSwapper;
@@ -78,7 +78,7 @@ public final class EncryptRuleConfigurationYamlSwapper
implements YamlRuleConfig
private Map<String, ShardingSphereAlgorithmConfiguration>
swapEncryptAlgorithm(final YamlEncryptRuleConfiguration yamlConfig) {
Map<String, ShardingSphereAlgorithmConfiguration> result = new
LinkedHashMap<>(yamlConfig.getEncryptors().size(), 1);
- for (Entry<String, YamlShardingSphereAlgorithmConfiguration> entry :
yamlConfig.getEncryptors().entrySet()) {
+ for (Entry<String, YamlAlgorithmConfiguration> entry :
yamlConfig.getEncryptors().entrySet()) {
result.put(entry.getKey(),
algorithmSwapper.swapToObject(entry.getValue()));
}
return result;
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapperTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapperTest.java
index 0238d07e988..bed0414249e 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleAlgorithmProviderConfigurationYamlSwapperTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfigu
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
import
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -69,7 +69,7 @@ public final class
EncryptRuleAlgorithmProviderConfigurationYamlSwapperTest {
YamlEncryptTableRuleConfiguration tableRuleConfig = new
YamlEncryptTableRuleConfiguration();
tableRuleConfig.setName("t_encrypt");
result.getTables().put("t_encrypt", tableRuleConfig);
- YamlShardingSphereAlgorithmConfiguration algorithmConfig = new
YamlShardingSphereAlgorithmConfiguration();
+ YamlAlgorithmConfiguration algorithmConfig = new
YamlAlgorithmConfiguration();
algorithmConfig.setType("CORE.FIXTURE");
result.getEncryptors().put("fixture_encryptor", algorithmConfig);
return result;
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapperTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapperTest.java
index 307bb1b8748..40dea43d4df 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationYamlSwapperTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfigu
import
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.yaml.config.rule.YamlEncryptTableRuleConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperFactory;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.junit.Test;
@@ -67,7 +67,7 @@ public final class EncryptRuleConfigurationYamlSwapperTest {
YamlEncryptTableRuleConfiguration tableRuleConfig = new
YamlEncryptTableRuleConfiguration();
tableRuleConfig.setName("t_encrypt");
result.getTables().put("t_encrypt", tableRuleConfig);
- YamlShardingSphereAlgorithmConfiguration algorithmConfig = new
YamlShardingSphereAlgorithmConfiguration();
+ YamlAlgorithmConfiguration algorithmConfig = new
YamlAlgorithmConfiguration();
algorithmConfig.setType("CORE.FIXTURE");
result.getEncryptors().put("fixture_encryptor", algorithmConfig);
return result;
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 3a3e5c5e4a4..61b9a403680 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-spring/shardingsphere-encrypt-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -29,7 +29,7 @@
},
{
"name": "spring.shardingsphere.rules.encrypt.encryptors",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration"
}
],
@@ -41,7 +41,7 @@
},
{
"name": "spring.shardingsphere.rules.encrypt.encryptors",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration"
},
{
@@ -70,7 +70,7 @@
{
"name": "handle-as",
"parameters": {
- "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration"
+ "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration"
}
}
]
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/YamlReadwriteSplittingRuleConfiguration.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/YamlReadwriteSplittingRuleConfiguration.java
index c2aafdb5f4e..604fc20fec7 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/YamlReadwriteSplittingRuleConfiguration.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/YamlReadwriteSplittingRuleConfiguration.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.readwritesplitting.yaml.config;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceRuleConfiguration;
@@ -36,7 +36,7 @@ public final class YamlReadwriteSplittingRuleConfiguration
implements YamlRuleCo
private Map<String, YamlReadwriteSplittingDataSourceRuleConfiguration>
dataSources = new LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
loadBalancers = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> loadBalancers = new
LinkedHashMap<>();
@Override
public Class<ReadwriteSplittingRuleConfiguration>
getRuleConfigurationType() {
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapper.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapper.java
index 5685fb46ec4..ef4e4097df2 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapper.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.readwritesplitting.algorithm.config.AlgorithmPr
import
org.apache.shardingsphere.readwritesplitting.constant.ReadwriteSplittingOrder;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.swapper.strategy.DynamicReadwriteSplittingStrategyConfigurationYamlSwapper;
@@ -50,7 +50,7 @@ public final class
ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapp
result.setDataSources(data.getDataSources().stream().collect(
Collectors.toMap(ReadwriteSplittingDataSourceRuleConfiguration::getName,
this::swapToYamlConfiguration, (oldValue, currentValue) -> oldValue,
LinkedHashMap::new)));
if (null != data.getLoadBalanceAlgorithms()) {
- data.getLoadBalanceAlgorithms().forEach((key, value) ->
result.getLoadBalancers().put(key, new
YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ data.getLoadBalanceAlgorithms().forEach((key, value) ->
result.getLoadBalancers().put(key, new
YamlAlgorithmConfiguration(value.getType(), value.getProps())));
}
return result;
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 14c86a83f0d..9b598b6dace 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -29,7 +29,7 @@
},
{
"name": "spring.shardingsphere.rules.readwrite-splitting.load-balancers",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration"
}
],
@@ -41,7 +41,7 @@
},
{
"name": "spring.shardingsphere.rules.readwrite-splitting.load-balancers",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration"
}
],
@@ -65,7 +65,7 @@
{
"name": "handle-as",
"parameters": {
- "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration"
+ "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration"
}
}
]
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/config/YamlShadowRuleConfiguration.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/config/YamlShadowRuleConfiguration.java
index f74d0c1cabf..c2c0d2920f7 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/config/YamlShadowRuleConfiguration.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/config/YamlShadowRuleConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.shadow.yaml.config;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.yaml.config.datasource.YamlShadowDataSourceConfiguration;
import
org.apache.shardingsphere.shadow.yaml.config.table.YamlShadowTableConfiguration;
@@ -41,7 +41,7 @@ public final class YamlShadowRuleConfiguration implements
YamlRuleConfiguration
private Map<String, YamlShadowTableConfiguration> tables = new
LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
shadowAlgorithms = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> shadowAlgorithms = new
LinkedHashMap<>();
@Override
public Class<ShadowRuleConfiguration> getRuleConfigurationType() {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapper.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapper.java
index f42294832bd..5cba3d22a79 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapper.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.yaml.swapper;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper;
import
org.apache.shardingsphere.shadow.algorithm.config.AlgorithmProvidedShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.constant.ShadowOrder;
@@ -45,7 +45,7 @@ public final class
ShadowRuleAlgorithmProviderConfigurationYamlSwapper implement
}
private void parseShadowAlgorithms(final
AlgorithmProvidedShadowRuleConfiguration data, final
YamlShadowRuleConfiguration yamlConfig) {
- data.getShadowAlgorithms().forEach((key, value) ->
yamlConfig.getShadowAlgorithms().put(key, new
YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ data.getShadowAlgorithms().forEach((key, value) ->
yamlConfig.getShadowAlgorithms().put(key, new
YamlAlgorithmConfiguration(value.getType(), value.getProps())));
}
private void parseShadowTables(final
AlgorithmProvidedShadowRuleConfiguration data, final
YamlShadowRuleConfiguration yamlConfig) {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapperTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapperTest.java
index 09377f7adc9..2e5a518a41d 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleAlgorithmProviderConfigurationYamlSwapperTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.yaml.swapper;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.shadow.algorithm.config.AlgorithmProvidedShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.algorithm.shadow.column.ColumnRegexMatchShadowAlgorithm;
import
org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration;
@@ -93,7 +93,7 @@ public final class
ShadowRuleAlgorithmProviderConfigurationYamlSwapperTest {
YamlShadowTableConfiguration yamlShadowTableConfig = new
YamlShadowTableConfiguration();
yamlShadowTableConfig.setShadowAlgorithmNames(Arrays.asList("user-id-match-algorithm",
"note-algorithm"));
result.getTables().put("t_order", yamlShadowTableConfig);
- YamlShardingSphereAlgorithmConfiguration yamlAlgorithmConfig = new
YamlShardingSphereAlgorithmConfiguration();
+ YamlAlgorithmConfiguration yamlAlgorithmConfig = new
YamlAlgorithmConfiguration();
yamlAlgorithmConfig.setType("COLUMN-REGULAR-MATCH");
result.getShadowAlgorithms().put("user-id-match-algorithm",
yamlAlgorithmConfig);
return result;
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 7892a9d09b2..aaa963962c7 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-spring/shardingsphere-shadow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -34,7 +34,7 @@
},
{
"name": "spring.shardingsphere.rules.shadow.shadow-algorithms",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration"
}
],
@@ -56,7 +56,7 @@
},
{
"name": "spring.shardingsphere.rules.shadow.shadow-algorithms",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.shadow.yaml.config.YamlShadowRuleConfiguration"
}
],
@@ -92,7 +92,7 @@
{
"name": "handle-as",
"parameters": {
- "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration"
+ "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration"
}
}
]
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 4509f231eb0..f03d2c69fba 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.yaml.config;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.rule.YamlShardingAutoTableRuleConfiguration;
@@ -57,11 +57,11 @@ public final class YamlShardingRuleConfiguration implements
YamlRuleConfiguratio
private YamlShardingAuditStrategyConfiguration defaultAuditStrategy;
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
shardingAlgorithms = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> shardingAlgorithms = new
LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
keyGenerators = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> keyGenerators = new
LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration> auditors =
new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> auditors = new
LinkedHashMap<>();
private String defaultShardingColumn;
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 99f5b1d589e..89b160a49c6 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.yaml.swapper;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper;
import
org.apache.shardingsphere.sharding.algorithm.config.AlgorithmProvidedShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.constant.ShardingOrder;
@@ -78,13 +78,13 @@ public final class
ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
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())));
+ data.getShardingAlgorithms().forEach((key, value) ->
yamlConfig.getShardingAlgorithms().put(key, new
YamlAlgorithmConfiguration(value.getType(), value.getProps())));
}
if (null != data.getKeyGenerators()) {
- data.getKeyGenerators().forEach((key, value) ->
yamlConfig.getKeyGenerators().put(key, new
YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ data.getKeyGenerators().forEach((key, value) ->
yamlConfig.getKeyGenerators().put(key, new
YamlAlgorithmConfiguration(value.getType(), value.getProps())));
}
if (null != data.getAuditors()) {
- data.getAuditors().forEach((key, value) ->
yamlConfig.getAuditors().put(key, new
YamlShardingSphereAlgorithmConfiguration(value.getType(), value.getProps())));
+ data.getAuditors().forEach((key, value) ->
yamlConfig.getAuditors().put(key, new
YamlAlgorithmConfiguration(value.getType(), value.getProps())));
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 5f34ace7fda..70de8e6f68a 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -89,12 +89,12 @@
},
{
"name": "spring.shardingsphere.rules.sharding.sharding-algorithms",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration"
},
{
"name": "spring.shardingsphere.rules.sharding.key-generators",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration"
}
],
@@ -186,12 +186,12 @@
},
{
"name": "spring.shardingsphere.rules.sharding.sharding-algorithms",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration"
},
{
"name": "spring.shardingsphere.rules.sharding.key-generators",
- "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration>",
+ "type": "java.util.Map<java.lang.String,
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration>",
"sourceType":
"org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration"
}
],
@@ -228,7 +228,7 @@
{
"name": "handle-as",
"parameters": {
- "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration"
+ "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration"
}
}
]
@@ -240,7 +240,7 @@
{
"name": "handle-as",
"parameters": {
- "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration"
+ "target":
"org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration"
}
}
]
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlShardingSphereAlgorithmConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
similarity index 89%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlShardingSphereAlgorithmConfiguration.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
index 5040ab8a7df..21134fb1d93 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlShardingSphereAlgorithmConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/algorithm/YamlAlgorithmConfiguration.java
@@ -26,13 +26,13 @@ import
org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
import java.util.Properties;
/**
- * ShardingSphere algorithm configuration for YAML.
+ * Algorithm configuration for YAML.
*/
@AllArgsConstructor
@NoArgsConstructor
@Getter
@Setter
-public final class YamlShardingSphereAlgorithmConfiguration implements
YamlConfiguration {
+public final class YamlAlgorithmConfiguration implements YamlConfiguration {
private String type;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/rule/YamlOnRuleAlteredActionConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/rule/YamlOnRuleAlteredActionConfiguration.java
index 974f08fa389..14401d0ea67 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/rule/YamlOnRuleAlteredActionConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/rule/YamlOnRuleAlteredActionConfiguration.java
@@ -22,7 +22,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
/**
* YAML on rule altered action configuration.
@@ -36,11 +36,11 @@ public final class YamlOnRuleAlteredActionConfiguration
implements YamlConfigura
private YamlOutputConfiguration output;
- private YamlShardingSphereAlgorithmConfiguration streamChannel;
+ private YamlAlgorithmConfiguration streamChannel;
- private YamlShardingSphereAlgorithmConfiguration completionDetector;
+ private YamlAlgorithmConfiguration completionDetector;
- private YamlShardingSphereAlgorithmConfiguration dataConsistencyChecker;
+ private YamlAlgorithmConfiguration dataConsistencyChecker;
@Data
public static final class YamlInputConfiguration implements
YamlConfiguration {
@@ -57,7 +57,7 @@ public final class YamlOnRuleAlteredActionConfiguration
implements YamlConfigura
private Integer shardingSize = DEFAULT_SHARDING_SIZE;
- private YamlShardingSphereAlgorithmConfiguration rateLimiter;
+ private YamlAlgorithmConfiguration rateLimiter;
/**
* Build with default value.
@@ -95,7 +95,7 @@ public final class YamlOnRuleAlteredActionConfiguration
implements YamlConfigura
private Integer batchSize = DEFAULT_BATCH_SIZE;
- private YamlShardingSphereAlgorithmConfiguration rateLimiter;
+ private YamlAlgorithmConfiguration rateLimiter;
/**
* Build with default value.
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapper.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapper.java
index 9856bc0a977..d792d8bdd06 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapper.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapper.java
@@ -18,27 +18,27 @@
package org.apache.shardingsphere.infra.yaml.config.swapper.algorithm;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlConfigurationSwapper;
/**
* ShardingSphere algorithm configuration YAML swapper.
*/
-public final class ShardingSphereAlgorithmConfigurationYamlSwapper implements
YamlConfigurationSwapper<YamlShardingSphereAlgorithmConfiguration,
ShardingSphereAlgorithmConfiguration> {
+public final class ShardingSphereAlgorithmConfigurationYamlSwapper implements
YamlConfigurationSwapper<YamlAlgorithmConfiguration,
ShardingSphereAlgorithmConfiguration> {
@Override
- public YamlShardingSphereAlgorithmConfiguration
swapToYamlConfiguration(final ShardingSphereAlgorithmConfiguration data) {
+ public YamlAlgorithmConfiguration swapToYamlConfiguration(final
ShardingSphereAlgorithmConfiguration data) {
if (null == data) {
return null;
}
- YamlShardingSphereAlgorithmConfiguration result = new
YamlShardingSphereAlgorithmConfiguration();
+ YamlAlgorithmConfiguration result = new YamlAlgorithmConfiguration();
result.setType(data.getType());
result.setProps(data.getProps());
return result;
}
@Override
- public ShardingSphereAlgorithmConfiguration swapToObject(final
YamlShardingSphereAlgorithmConfiguration yamlConfig) {
+ public ShardingSphereAlgorithmConfiguration swapToObject(final
YamlAlgorithmConfiguration yamlConfig) {
if (null == yamlConfig) {
return null;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
index 78d68cfb2f0..75ce289e9bd 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.yaml.config.swapper.algorithm;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.junit.Test;
import java.util.Properties;
@@ -30,7 +30,7 @@ public final class
ShardingSphereAlgorithmConfigurationYamlSwapperTest {
@Test
public void assertSwapToYaml() {
- YamlShardingSphereAlgorithmConfiguration actual = new
ShardingSphereAlgorithmConfigurationYamlSwapper().swapToYamlConfiguration(
+ YamlAlgorithmConfiguration actual = new
ShardingSphereAlgorithmConfigurationYamlSwapper().swapToYamlConfiguration(
new ShardingSphereAlgorithmConfiguration("TEST",
createProps()));
assertThat(actual.getType(), is("TEST"));
assertThat(actual.getProps().getProperty("key"), is("value"));
@@ -38,7 +38,7 @@ public final class
ShardingSphereAlgorithmConfigurationYamlSwapperTest {
@Test
public void assertSwapToObject() {
- YamlShardingSphereAlgorithmConfiguration yamlConfig = new
YamlShardingSphereAlgorithmConfiguration("TEST", createProps());
+ YamlAlgorithmConfiguration yamlConfig = new
YamlAlgorithmConfiguration("TEST", createProps());
ShardingSphereAlgorithmConfiguration actual = new
ShardingSphereAlgorithmConfigurationYamlSwapper().swapToObject(yamlConfig);
assertThat(actual.getType(), is("TEST"));
assertThat(actual.getProps().getProperty("key"), is("value"));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rulealtered/OnRuleAlteredActionConfigurationYamlSwapperTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rulealtered/OnRuleAlteredActionConfigurationYamlSwapperTest.java
index f6df49386d0..770936a9d69 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rulealtered/OnRuleAlteredActionConfigurationYamlSwapperTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/config/swapper/rulealtered/OnRuleAlteredActionConfigurationYamlSwapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.yaml.config.swapper.rulealtered;
import
org.apache.shardingsphere.infra.config.rule.rulealtered.OnRuleAlteredActionConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration.YamlInputConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration.YamlOutputConfiguration;
@@ -43,19 +43,19 @@ public final class
OnRuleAlteredActionConfigurationYamlSwapperTest {
rateLimiterProps.setProperty("qps", "50");
YamlInputConfiguration yamlInputConfig =
YamlInputConfiguration.buildWithDefaultValue();
yamlConfig.setInput(yamlInputConfig);
- yamlInputConfig.setRateLimiter(new
YamlShardingSphereAlgorithmConfiguration("INPUT", rateLimiterProps));
+ yamlInputConfig.setRateLimiter(new YamlAlgorithmConfiguration("INPUT",
rateLimiterProps));
YamlOutputConfiguration yamlOutputConfig =
YamlOutputConfiguration.buildWithDefaultValue();
- yamlOutputConfig.setRateLimiter(new
YamlShardingSphereAlgorithmConfiguration("OUTPUT", rateLimiterProps));
+ yamlOutputConfig.setRateLimiter(new
YamlAlgorithmConfiguration("OUTPUT", rateLimiterProps));
yamlConfig.setOutput(yamlOutputConfig);
Properties streamChannelProps = new Properties();
streamChannelProps.setProperty("block-queue-size", "10000");
- yamlConfig.setStreamChannel(new
YamlShardingSphereAlgorithmConfiguration("MEMORY", streamChannelProps));
+ yamlConfig.setStreamChannel(new YamlAlgorithmConfiguration("MEMORY",
streamChannelProps));
Properties completionDetectorProps = new Properties();
completionDetectorProps.setProperty("incremental-task-idle-seconds-threshold",
"1800");
- yamlConfig.setCompletionDetector(new
YamlShardingSphereAlgorithmConfiguration("IDLE", completionDetectorProps));
+ yamlConfig.setCompletionDetector(new
YamlAlgorithmConfiguration("IDLE", completionDetectorProps));
Properties dataConsistencyCheckerProps = new Properties();
dataConsistencyCheckerProps.setProperty("chunk-size", "1000");
- yamlConfig.setDataConsistencyChecker(new
YamlShardingSphereAlgorithmConfiguration("DATA_MATCH",
dataConsistencyCheckerProps));
+ yamlConfig.setDataConsistencyChecker(new
YamlAlgorithmConfiguration("DATA_MATCH", dataConsistencyCheckerProps));
OnRuleAlteredActionConfigurationYamlSwapper yamlSwapper = new
OnRuleAlteredActionConfigurationYamlSwapper();
OnRuleAlteredActionConfiguration actualConfig =
yamlSwapper.swapToObject(yamlConfig);
YamlOnRuleAlteredActionConfiguration actualYamlConfig =
yamlSwapper.swapToYamlConfiguration(actualConfig);
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
index 9c57eaeb6dd..463903d1ea4 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolDestroyer;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperEngine;
import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
@@ -58,7 +58,7 @@ public final class ShardingSpherePipelineDataSourceCreator
implements PipelineDa
}
private void enableRangeQueryForInline(final YamlShardingRuleConfiguration
shardingRuleConfig) {
- for (YamlShardingSphereAlgorithmConfiguration each :
shardingRuleConfig.getShardingAlgorithms().values()) {
+ for (YamlAlgorithmConfiguration each :
shardingRuleConfig.getShardingAlgorithms().values()) {
if ("INLINE".equalsIgnoreCase(each.getType())) {
each.getProps().put("allow-range-query-with-inline-sharding",
Boolean.TRUE.toString());
}
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityConfiguration.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityConfiguration.java
index cffe46a7a65..52c6e8377e7 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityConfiguration.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -39,9 +39,9 @@ public final class YamlAuthorityConfiguration implements
YamlRuleConfiguration {
private Collection<YamlAuthorityUserConfiguration> users = new
LinkedList<>();
- private YamlShardingSphereAlgorithmConfiguration privilege;
+ private YamlAlgorithmConfiguration privilege;
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
authenticators = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> authenticators = new
LinkedHashMap<>();
private String defaultAuthenticator;
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
index 0af7a92de34..b7384cd8ef6 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import java.util.Collection;
import java.util.LinkedList;
@@ -35,7 +35,7 @@ public final class YamlAuthorityRuleConfiguration implements
YamlRuleConfigurati
private Collection<String> users = new LinkedList<>();
- private YamlShardingSphereAlgorithmConfiguration provider;
+ private YamlAlgorithmConfiguration provider;
@Override
public Class<AuthorityRuleConfiguration> getRuleConfigurationType() {
diff --git
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapperTest.java
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapperTest.java
index 49b01a9ea3e..08b6992384a 100644
---
a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapperTest.java
+++
b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapperTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.authority.yaml.swapper;
import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
import
org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.junit.Test;
import java.util.Collections;
@@ -47,7 +47,7 @@ public final class AuthorityRuleConfigurationYamlSwapperTest {
public void assertSwapToObject() {
YamlAuthorityRuleConfiguration authorityRuleConfig = new
YamlAuthorityRuleConfiguration();
authorityRuleConfig.setUsers(Collections.singletonList("root@localhost:pass"));
- authorityRuleConfig.setProvider(new
YamlShardingSphereAlgorithmConfiguration("type", new Properties()));
+ authorityRuleConfig.setProvider(new YamlAlgorithmConfiguration("type",
new Properties()));
AuthorityRuleConfiguration actual =
swapper.swapToObject(authorityRuleConfig);
assertThat(actual.getUsers().size(), is(1));
assertNotNull(actual.getProvider());
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
index 23ae48368bb..4f30fedb9eb 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmC
import
org.apache.shardingsphere.infra.config.rule.rulealtered.OnRuleAlteredActionConfiguration;
import
org.apache.shardingsphere.infra.config.rule.rulealtered.OnRuleAlteredActionConfiguration.InputConfiguration;
import
org.apache.shardingsphere.infra.config.rule.rulealtered.OnRuleAlteredActionConfiguration.OutputConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration.YamlInputConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlOnRuleAlteredActionConfiguration.YamlOutputConfiguration;
@@ -112,7 +112,7 @@ public final class RuleAlteredContext {
yamlActionConfig.getOutput().fillInNullFieldsWithDefaultValue();
}
if (null == yamlActionConfig.getStreamChannel()) {
- yamlActionConfig.setStreamChannel(new
YamlShardingSphereAlgorithmConfiguration(MemoryPipelineChannelCreator.TYPE, new
Properties()));
+ yamlActionConfig.setStreamChannel(new
YamlAlgorithmConfiguration(MemoryPipelineChannelCreator.TYPE, new
Properties()));
}
return SWAPPER.swapToObject(yamlActionConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/yaml/config/YamlTrafficRuleConfiguration.java
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/yaml/config/YamlTrafficRuleConfiguration.java
index 365aa72e413..702de3e0604 100644
---
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/yaml/config/YamlTrafficRuleConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/yaml/config/YamlTrafficRuleConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.traffic.yaml.config;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration;
import java.util.LinkedHashMap;
@@ -35,9 +35,9 @@ public final class YamlTrafficRuleConfiguration implements
YamlRuleConfiguration
private Map<String, YamlTrafficStrategyConfiguration> trafficStrategies =
new LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
trafficAlgorithms = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> trafficAlgorithms = new
LinkedHashMap<>();
- private Map<String, YamlShardingSphereAlgorithmConfiguration>
loadBalancers = new LinkedHashMap<>();
+ private Map<String, YamlAlgorithmConfiguration> loadBalancers = new
LinkedHashMap<>();
@Override
public Class<TrafficRuleConfiguration> getRuleConfigurationType() {
diff --git
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/test/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationYamlSwapperTest.java
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/test/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationYamlSwapperTest.java
index 394d99c6093..4d19ec8e5a9 100644
---
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/test/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationYamlSwapperTest.java
+++
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/test/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationYamlSwapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.traffic.yaml.swapper;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration;
import
org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration;
import
org.apache.shardingsphere.traffic.yaml.config.YamlTrafficRuleConfiguration;
@@ -93,14 +93,14 @@ public final class TrafficRuleConfigurationYamlSwapperTest {
return result;
}
- private YamlShardingSphereAlgorithmConfiguration
createYamlTrafficAlgorithm() {
- YamlShardingSphereAlgorithmConfiguration result =
mock(YamlShardingSphereAlgorithmConfiguration.class);
+ private YamlAlgorithmConfiguration createYamlTrafficAlgorithm() {
+ YamlAlgorithmConfiguration result =
mock(YamlAlgorithmConfiguration.class);
when(result.getType()).thenReturn("SIMPLE");
return result;
}
- private YamlShardingSphereAlgorithmConfiguration createYamlLoadBalancer() {
- YamlShardingSphereAlgorithmConfiguration result =
mock(YamlShardingSphereAlgorithmConfiguration.class);
+ private YamlAlgorithmConfiguration createYamlLoadBalancer() {
+ YamlAlgorithmConfiguration result =
mock(YamlAlgorithmConfiguration.class);
when(result.getType()).thenReturn("RANDOM");
return result;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
index 3159cdd9293..557fb4fbb42 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.config;
import
org.apache.shardingsphere.encrypt.yaml.config.YamlEncryptRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDataSourceConfiguration;
import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
@@ -114,10 +114,10 @@ public final class ProxyConfigurationLoaderTest {
assertThat(actual.getEncryptors().size(), is(2));
assertTrue(actual.getEncryptors().containsKey("aes_encryptor"));
assertTrue(actual.getEncryptors().containsKey("md5_encryptor"));
- YamlShardingSphereAlgorithmConfiguration aesEncryptAlgorithmConfig =
actual.getEncryptors().get("aes_encryptor");
+ YamlAlgorithmConfiguration aesEncryptAlgorithmConfig =
actual.getEncryptors().get("aes_encryptor");
assertThat(aesEncryptAlgorithmConfig.getType(), is("AES"));
assertThat(aesEncryptAlgorithmConfig.getProps().getProperty("aes-key-value"),
is("123456abc"));
- YamlShardingSphereAlgorithmConfiguration md5EncryptAlgorithmConfig =
actual.getEncryptors().get("md5_encryptor");
+ YamlAlgorithmConfiguration md5EncryptAlgorithmConfig =
actual.getEncryptors().get("md5_encryptor");
assertThat(md5EncryptAlgorithmConfig.getType(), is("MD5"));
}
