You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2024/04/30 10:51:58 UTC
(shardingsphere) branch master updated: Remove RepositoryTupleSwapper.swapToObject() (#31077)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b51c8213310 Remove RepositoryTupleSwapper.swapToObject() (#31077)
b51c8213310 is described below
commit b51c8213310607dcce496aecb9859a2fac4c0a08
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Apr 30 18:51:51 2024 +0800
Remove RepositoryTupleSwapper.swapToObject() (#31077)
---
...astRuleConfigurationRepositoryTupleSwapper.java | 13 ------
...yptRuleConfigurationRepositoryTupleSwapper.java | 22 ----------
...askRuleConfigurationRepositoryTupleSwapper.java | 22 ----------
...ingRuleConfigurationRepositoryTupleSwapper.java | 22 ----------
...dowRuleConfigurationRepositoryTupleSwapper.java | 29 -------------
...ingRuleConfigurationRepositoryTupleSwapper.java | 50 ----------------------
...ityRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...ockRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...ingRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...gleRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...ionRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...serRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...torRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...ficRuleConfigurationRepositoryTupleSwapper.java | 12 ------
...ionRuleConfigurationRepositoryTupleSwapper.java | 12 ------
.../mode/spi/RepositoryTupleSwapper.java | 8 ----
16 files changed, 274 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java
index cd8b8d46258..555a3bb7d8c 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java
@@ -37,8 +37,6 @@ import java.util.stream.Collectors;
*/
public final class BroadcastRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<BroadcastRuleConfiguration, YamlBroadcastRuleConfiguration> {
- private final YamlBroadcastRuleConfigurationSwapper ruleConfigSwapper = new YamlBroadcastRuleConfigurationSwapper();
-
private final RuleNodePath broadcastRuleNodePath = new BroadcastRuleNodePathProvider().getRuleNodePath();
@Override
@@ -59,17 +57,6 @@ public final class BroadcastRuleConfigurationRepositoryTupleSwapper implements R
return Optional.empty();
}
- @Override
- public Optional<BroadcastRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- List<RepositoryTuple> validTuples = repositoryTuples.stream().filter(each -> broadcastRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
- for (RepositoryTuple each : validTuples) {
- if (broadcastRuleNodePath.getRoot().isValidatedPath(each.getKey())) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlBroadcastRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<BroadcastRuleConfiguration> getTypeClass() {
return BroadcastRuleConfiguration.class;
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
index 3cfdbddc40b..e0bdd2c9331 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
@@ -42,8 +42,6 @@ import java.util.stream.Collectors;
*/
public final class EncryptRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<EncryptRuleConfiguration, YamlEncryptRuleConfiguration> {
- private final YamlEncryptRuleConfigurationSwapper ruleConfigSwapper = new YamlEncryptRuleConfigurationSwapper();
-
private final RuleNodePath encryptRuleNodePath = new EncryptRuleNodePathProvider().getRuleNodePath();
@Override
@@ -78,26 +76,6 @@ public final class EncryptRuleConfigurationRepositoryTupleSwapper implements Rep
return Optional.of(yamlRuleConfig);
}
- @Override
- public Optional<EncryptRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- List<RepositoryTuple> validTuples = repositoryTuples.stream().filter(each -> encryptRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
- if (validTuples.isEmpty()) {
- return Optional.empty();
- }
- YamlEncryptRuleConfiguration yamlRuleConfig = new YamlEncryptRuleConfiguration();
- Map<String, YamlEncryptTableRuleConfiguration> tables = new LinkedHashMap<>();
- Map<String, YamlAlgorithmConfiguration> encryptors = new LinkedHashMap<>();
- for (RepositoryTuple each : validTuples) {
- encryptRuleNodePath.getNamedItem(EncryptRuleNodePathProvider.TABLES).getName(each.getKey())
- .ifPresent(optional -> tables.put(optional, YamlEngine.unmarshal(each.getValue(), YamlEncryptTableRuleConfiguration.class)));
- encryptRuleNodePath.getNamedItem(EncryptRuleNodePathProvider.ENCRYPTORS).getName(each.getKey())
- .ifPresent(optional -> encryptors.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- }
- yamlRuleConfig.setTables(tables);
- yamlRuleConfig.setEncryptors(encryptors);
- return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));
- }
-
@Override
public Class<EncryptRuleConfiguration> getTypeClass() {
return EncryptRuleConfiguration.class;
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
index 81cfad8bf04..bee9818f5af 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
@@ -42,8 +42,6 @@ import java.util.stream.Collectors;
*/
public final class MaskRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<MaskRuleConfiguration, YamlMaskRuleConfiguration> {
- private final YamlMaskRuleConfigurationSwapper ruleConfigSwapper = new YamlMaskRuleConfigurationSwapper();
-
private final RuleNodePath maskRuleNodePath = new MaskRuleNodePathProvider().getRuleNodePath();
@Override
@@ -78,26 +76,6 @@ public final class MaskRuleConfigurationRepositoryTupleSwapper implements Reposi
return Optional.of(yamlRuleConfig);
}
- @Override
- public Optional<MaskRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- List<RepositoryTuple> validTuples = repositoryTuples.stream().filter(each -> maskRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
- if (validTuples.isEmpty()) {
- return Optional.empty();
- }
- YamlMaskRuleConfiguration yamlRuleConfig = new YamlMaskRuleConfiguration();
- Map<String, YamlMaskTableRuleConfiguration> tables = new LinkedHashMap<>();
- Map<String, YamlAlgorithmConfiguration> maskAlgorithms = new LinkedHashMap<>();
- for (RepositoryTuple each : validTuples) {
- maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.TABLES).getName(each.getKey())
- .ifPresent(optional -> tables.put(optional, YamlEngine.unmarshal(each.getValue(), YamlMaskTableRuleConfiguration.class)));
- maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.MASK_ALGORITHMS).getName(each.getKey())
- .ifPresent(optional -> maskAlgorithms.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- }
- yamlRuleConfig.setTables(tables);
- yamlRuleConfig.setMaskAlgorithms(maskAlgorithms);
- return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));
- }
-
@Override
public Class<MaskRuleConfiguration> getTypeClass() {
return MaskRuleConfiguration.class;
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
index 8830a38736e..32ce54006d8 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
@@ -42,8 +42,6 @@ import java.util.stream.Collectors;
*/
public final class ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<ReadwriteSplittingRuleConfiguration, YamlReadwriteSplittingRuleConfiguration> {
- private final YamlReadwriteSplittingRuleConfigurationSwapper ruleConfigSwapper = new YamlReadwriteSplittingRuleConfigurationSwapper();
-
private final RuleNodePath readwriteSplittingRuleNodePath = new ReadwriteSplittingRuleNodePathProvider().getRuleNodePath();
@Override
@@ -80,26 +78,6 @@ public final class ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper imp
return Optional.of(yamlRuleConfig);
}
- @Override
- public Optional<ReadwriteSplittingRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- List<RepositoryTuple> validRepositoryTuples = repositoryTuples.stream().filter(each -> readwriteSplittingRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
- if (validRepositoryTuples.isEmpty()) {
- return Optional.empty();
- }
- YamlReadwriteSplittingRuleConfiguration yamlRuleConfig = new YamlReadwriteSplittingRuleConfiguration();
- Map<String, YamlReadwriteSplittingDataSourceGroupRuleConfiguration> dataSourceGroups = new LinkedHashMap<>();
- Map<String, YamlAlgorithmConfiguration> loadBalancers = new LinkedHashMap<>();
- for (RepositoryTuple each : validRepositoryTuples) {
- readwriteSplittingRuleNodePath.getNamedItem(ReadwriteSplittingRuleNodePathProvider.DATA_SOURCES).getName(each.getKey())
- .ifPresent(optional -> dataSourceGroups.put(optional, YamlEngine.unmarshal(each.getValue(), YamlReadwriteSplittingDataSourceGroupRuleConfiguration.class)));
- readwriteSplittingRuleNodePath.getNamedItem(ReadwriteSplittingRuleNodePathProvider.LOAD_BALANCERS).getName(each.getKey())
- .ifPresent(optional -> loadBalancers.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- }
- yamlRuleConfig.setDataSourceGroups(dataSourceGroups);
- yamlRuleConfig.setLoadBalancers(loadBalancers);
- return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));
- }
-
@Override
public Class<ReadwriteSplittingRuleConfiguration> getTypeClass() {
return ReadwriteSplittingRuleConfiguration.class;
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java
index 7e274f27819..e19c537c47b 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java
@@ -44,8 +44,6 @@ import java.util.stream.Collectors;
*/
public final class ShadowRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<ShadowRuleConfiguration, YamlShadowRuleConfiguration> {
- private final YamlShadowRuleConfigurationSwapper ruleConfigSwapper = new YamlShadowRuleConfigurationSwapper();
-
private final RuleNodePath shadowRuleNodePath = new ShadowRuleNodePathProvider().getRuleNodePath();
@Override
@@ -93,33 +91,6 @@ public final class ShadowRuleConfigurationRepositoryTupleSwapper implements Repo
return Optional.of(yamlRuleConfig);
}
- @Override
- public Optional<ShadowRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- List<RepositoryTuple> validRepositoryTuples = repositoryTuples.stream().filter(each -> shadowRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
- if (validRepositoryTuples.isEmpty()) {
- return Optional.empty();
- }
- YamlShadowRuleConfiguration yamlRuleConfig = new YamlShadowRuleConfiguration();
- Map<String, YamlShadowDataSourceConfiguration> dataSources = new LinkedHashMap<>();
- Map<String, YamlShadowTableConfiguration> tables = new LinkedHashMap<>();
- Map<String, YamlAlgorithmConfiguration> shadowAlgorithms = new LinkedHashMap<>();
- for (RepositoryTuple each : validRepositoryTuples) {
- shadowRuleNodePath.getNamedItem(ShadowRuleNodePathProvider.DATA_SOURCES).getName(each.getKey())
- .ifPresent(optional -> dataSources.put(optional, YamlEngine.unmarshal(each.getValue(), YamlShadowDataSourceConfiguration.class)));
- shadowRuleNodePath.getNamedItem(ShadowRuleNodePathProvider.TABLES).getName(each.getKey())
- .ifPresent(optional -> tables.put(optional, YamlEngine.unmarshal(each.getValue(), YamlShadowTableConfiguration.class)));
- shadowRuleNodePath.getNamedItem(ShadowRuleNodePathProvider.ALGORITHMS).getName(each.getKey())
- .ifPresent(optional -> shadowAlgorithms.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- if (shadowRuleNodePath.getUniqueItem(ShadowRuleNodePathProvider.DEFAULT_ALGORITHM).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setDefaultShadowAlgorithmName(each.getValue());
- }
- }
- yamlRuleConfig.setDataSources(dataSources);
- yamlRuleConfig.setTables(tables);
- yamlRuleConfig.setShadowAlgorithms(shadowAlgorithms);
- return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));
- }
-
@Override
public Class<ShadowRuleConfiguration> getTypeClass() {
return ShadowRuleConfiguration.class;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java
index 32494707598..85eb1bcc3ae 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java
@@ -47,8 +47,6 @@ import java.util.stream.Collectors;
*/
public final class ShardingRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<ShardingRuleConfiguration, YamlShardingRuleConfiguration> {
- private final YamlShardingRuleConfigurationSwapper ruleConfigSwapper = new YamlShardingRuleConfigurationSwapper();
-
private final RuleNodePath shardingRuleNodePath = new ShardingRuleNodePathProvider().getRuleNodePath();
@Override
@@ -161,54 +159,6 @@ public final class ShardingRuleConfigurationRepositoryTupleSwapper implements Re
return Optional.of(yamlRuleConfig);
}
- @Override
- public Optional<ShardingRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- List<RepositoryTuple> validRepositoryTuples = repositoryTuples.stream().filter(each -> shardingRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
- if (validRepositoryTuples.isEmpty()) {
- return Optional.empty();
- }
- YamlShardingRuleConfiguration yamlRuleConfig = new YamlShardingRuleConfiguration();
- Map<String, YamlTableRuleConfiguration> tables = new LinkedHashMap<>();
- Map<String, YamlShardingAutoTableRuleConfiguration> autoTables = new LinkedHashMap<>();
- Collection<String> bindingTables = new LinkedList<>();
- Map<String, YamlAlgorithmConfiguration> shardingAlgorithms = new LinkedHashMap<>();
- Map<String, YamlAlgorithmConfiguration> keyGenerators = new LinkedHashMap<>();
- Map<String, YamlAlgorithmConfiguration> auditors = new LinkedHashMap<>();
- for (RepositoryTuple each : validRepositoryTuples) {
- shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.TABLES).getName(each.getKey())
- .ifPresent(optional -> tables.put(optional, YamlEngine.unmarshal(each.getValue(), YamlTableRuleConfiguration.class)));
- shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.AUTO_TABLES).getName(each.getKey())
- .ifPresent(optional -> autoTables.put(optional, YamlEngine.unmarshal(each.getValue(), YamlShardingAutoTableRuleConfiguration.class)));
- shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.BINDING_TABLES).getName(each.getKey()).ifPresent(optional -> bindingTables.add(each.getValue()));
- shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.ALGORITHMS).getName(each.getKey())
- .ifPresent(optional -> shardingAlgorithms.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.KEY_GENERATORS).getName(each.getKey())
- .ifPresent(optional -> keyGenerators.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.AUDITORS).getName(each.getKey())
- .ifPresent(optional -> auditors.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
- if (shardingRuleNodePath.getUniqueItem(ShardingRuleNodePathProvider.DEFAULT_DATABASE_STRATEGY).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setDefaultDatabaseStrategy(YamlEngine.unmarshal(each.getValue(), YamlShardingStrategyConfiguration.class));
- } else if (shardingRuleNodePath.getUniqueItem(ShardingRuleNodePathProvider.DEFAULT_TABLE_STRATEGY).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setDefaultTableStrategy(YamlEngine.unmarshal(each.getValue(), YamlShardingStrategyConfiguration.class));
- } else if (shardingRuleNodePath.getUniqueItem(ShardingRuleNodePathProvider.DEFAULT_KEY_GENERATE_STRATEGY).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setDefaultKeyGenerateStrategy(YamlEngine.unmarshal(each.getValue(), YamlKeyGenerateStrategyConfiguration.class));
- } else if (shardingRuleNodePath.getUniqueItem(ShardingRuleNodePathProvider.DEFAULT_AUDIT_STRATEGY).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setDefaultAuditStrategy(YamlEngine.unmarshal(each.getValue(), YamlShardingAuditStrategyConfiguration.class));
- } else if (shardingRuleNodePath.getUniqueItem(ShardingRuleNodePathProvider.DEFAULT_SHARDING_COLUMN).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setDefaultShardingColumn(each.getValue());
- } else if (shardingRuleNodePath.getUniqueItem(ShardingRuleNodePathProvider.SHARDING_CACHE).isValidatedPath(each.getKey())) {
- yamlRuleConfig.setShardingCache(YamlEngine.unmarshal(each.getValue(), YamlShardingCacheConfiguration.class));
- }
- }
- yamlRuleConfig.setTables(tables);
- yamlRuleConfig.setAutoTables(autoTables);
- yamlRuleConfig.setBindingTables(bindingTables);
- yamlRuleConfig.setShardingAlgorithms(shardingAlgorithms);
- yamlRuleConfig.setKeyGenerators(keyGenerators);
- yamlRuleConfig.setAuditors(auditors);
- return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));
- }
-
@Override
public Class<ShardingRuleConfiguration> getTypeClass() {
return ShardingRuleConfiguration.class;
diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java
index 1fd7947cc53..6e98d0b71df 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class AuthorityRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<AuthorityRuleConfiguration, YamlAuthorityRuleConfiguration> {
- private final YamlAuthorityRuleConfigurationSwapper ruleConfigSwapper = new YamlAuthorityRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlAuthorityRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class AuthorityRuleConfigurationRepositoryTupleSwapper implements R
return Optional.empty();
}
- @Override
- public Optional<AuthorityRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAuthorityRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<AuthorityRuleConfiguration> getTypeClass() {
return AuthorityRuleConfiguration.class;
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
index f58a83a2824..8a5e71aeae7 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class GlobalClockRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<GlobalClockRuleConfiguration, YamlGlobalClockRuleConfiguration> {
- private final YamlGlobalClockRuleConfigurationSwapper ruleConfigSwapper = new YamlGlobalClockRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlGlobalClockRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class GlobalClockRuleConfigurationRepositoryTupleSwapper implements
return Optional.empty();
}
- @Override
- public Optional<GlobalClockRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlGlobalClockRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public String getRuleTagName() {
return "GLOBAL_CLOCK";
diff --git a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java
index 97cccc84011..175da5c2244 100644
--- a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class LoggingRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<LoggingRuleConfiguration, YamlLoggingRuleConfiguration> {
- private final YamlLoggingRuleConfigurationSwapper ruleConfigSwapper = new YamlLoggingRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlLoggingRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class LoggingRuleConfigurationRepositoryTupleSwapper implements Rep
return Optional.empty();
}
- @Override
- public Optional<LoggingRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlLoggingRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<LoggingRuleConfiguration> getTypeClass() {
return LoggingRuleConfiguration.class;
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java
index 035bb70b1f4..47bcd6320dc 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java
@@ -36,8 +36,6 @@ import java.util.stream.Collectors;
*/
public final class SingleRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<SingleRuleConfiguration, YamlSingleRuleConfiguration> {
- private final YamlSingleRuleConfigurationSwapper ruleConfigSwapper = new YamlSingleRuleConfigurationSwapper();
-
private final RuleNodePath singleRuleNodePath = new SingleRuleNodePathProvider().getRuleNodePath();
@Override
@@ -55,16 +53,6 @@ public final class SingleRuleConfigurationRepositoryTupleSwapper implements Repo
return Optional.empty();
}
- @Override
- public Optional<SingleRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples.stream().filter(each -> singleRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList())) {
- if (singleRuleNodePath.getUniqueItem(SingleRuleNodePathProvider.TABLES).isValidatedPath(each.getKey())) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSingleRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<SingleRuleConfiguration> getTypeClass() {
return SingleRuleConfiguration.class;
diff --git a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java
index 65af70c026a..4af317ae756 100644
--- a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class SQLFederationRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<SQLFederationRuleConfiguration, YamlSQLFederationRuleConfiguration> {
- private final YamlSQLFederationRuleConfigurationSwapper ruleConfigSwapper = new YamlSQLFederationRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlSQLFederationRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class SQLFederationRuleConfigurationRepositoryTupleSwapper implemen
return Optional.empty();
}
- @Override
- public Optional<SQLFederationRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLFederationRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<SQLFederationRuleConfiguration> getTypeClass() {
return SQLFederationRuleConfiguration.class;
diff --git a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java
index 890e524eb35..c9be0832535 100644
--- a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class SQLParserRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<SQLParserRuleConfiguration, YamlSQLParserRuleConfiguration> {
- private final YamlSQLParserRuleConfigurationSwapper ruleConfigSwapper = new YamlSQLParserRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlSQLParserRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class SQLParserRuleConfigurationRepositoryTupleSwapper implements R
return Optional.empty();
}
- @Override
- public Optional<SQLParserRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLParserRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<SQLParserRuleConfiguration> getTypeClass() {
return SQLParserRuleConfiguration.class;
diff --git a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java
index 4b2da55ab9f..11cfcbd02ec 100644
--- a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class SQLTranslatorRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<SQLTranslatorRuleConfiguration, YamlSQLTranslatorRuleConfiguration> {
- private final YamlSQLTranslatorRuleConfigurationSwapper ruleConfigSwapper = new YamlSQLTranslatorRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlSQLTranslatorRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class SQLTranslatorRuleConfigurationRepositoryTupleSwapper implemen
return Optional.empty();
}
- @Override
- public Optional<SQLTranslatorRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLTranslatorRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<SQLTranslatorRuleConfiguration> getTypeClass() {
return SQLTranslatorRuleConfiguration.class;
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java
index 8c156db412e..ac006b8ffd6 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class TrafficRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<TrafficRuleConfiguration, YamlTrafficRuleConfiguration> {
- private final YamlTrafficRuleConfigurationSwapper ruleConfigSwapper = new YamlTrafficRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlTrafficRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class TrafficRuleConfigurationRepositoryTupleSwapper implements Rep
return Optional.empty();
}
- @Override
- public Optional<TrafficRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTrafficRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<TrafficRuleConfiguration> getTypeClass() {
return TrafficRuleConfiguration.class;
diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java
index 2a097088814..663e38b426e 100644
--- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java
+++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java
@@ -34,8 +34,6 @@ import java.util.Optional;
*/
public final class TransactionRuleConfigurationRepositoryTupleSwapper implements RepositoryTupleSwapper<TransactionRuleConfiguration, YamlTransactionRuleConfiguration> {
- private final YamlTransactionRuleConfigurationSwapper ruleConfigSwapper = new YamlTransactionRuleConfigurationSwapper();
-
@Override
public Collection<RepositoryTuple> swapToRepositoryTuples(final YamlTransactionRuleConfiguration yamlRuleConfig) {
return Collections.singleton(new RepositoryTuple(getRuleTagName().toLowerCase(), YamlEngine.marshal(yamlRuleConfig)));
@@ -51,16 +49,6 @@ public final class TransactionRuleConfigurationRepositoryTupleSwapper implements
return Optional.empty();
}
- @Override
- public Optional<TransactionRuleConfiguration> swapToObject(final Collection<RepositoryTuple> repositoryTuples) {
- for (RepositoryTuple each : repositoryTuples) {
- if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey()).isPresent()) {
- return Optional.of(ruleConfigSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTransactionRuleConfiguration.class)));
- }
- }
- return Optional.empty();
- }
-
@Override
public Class<TransactionRuleConfiguration> getTypeClass() {
return TransactionRuleConfiguration.class;
diff --git a/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
index 4575d1163c3..4dfc4dc72f3 100644
--- a/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
+++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java
@@ -51,14 +51,6 @@ public interface RepositoryTupleSwapper<T extends RuleConfiguration, Y extends Y
*/
Optional<Y> swapToObject0(Collection<RepositoryTuple> repositoryTuples);
- /**
- * Swap from repository tuple to object.
- *
- * @param repositoryTuples repository tuples
- * @return swapped object
- */
- Optional<T> swapToObject(Collection<RepositoryTuple> repositoryTuples);
-
/**
* Get YAML rule tag name.
*