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 8d3c5f727d5 Rename RepositoryTupleSwapper.swapToObject0() (#31078)
8d3c5f727d5 is described below
commit 8d3c5f727d5191f2afe4e9045813de87e4b5e110
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Apr 30 19:08:48 2024 +0800
Rename RepositoryTupleSwapper.swapToObject0() (#31078)
---
.../swapper/BroadcastRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/BroadcastRuleConfigurationRepositoryTupleSwapperTest.java | 4 ++--
.../yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/EncryptRuleConfigurationRepositoryTupleSwapperTest.java | 4 ++--
.../yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapperTest.java | 4 ++--
.../ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java | 2 +-
...ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest.java | 4 ++--
.../yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/ShadowRuleConfigurationRepositoryTupleSwapperTest.java | 4 ++--
.../yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/ShardingRuleConfigurationRepositoryTupleSwapperTest.java | 4 ++--
.../swapper/AuthorityRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/GlobalClockRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../yaml/swapper/LoggingRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../metadata/persist/service/config/RepositoryTupleSwapperEngine.java | 4 ++--
.../config/swapper/SingleRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/SQLFederationRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/SQLParserRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/SQLTranslatorRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../yaml/swapper/TrafficRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../swapper/TransactionRuleConfigurationRepositoryTupleSwapper.java | 2 +-
.../org/apache/shardingsphere/mode/spi/RepositoryTupleSwapper.java | 2 +-
23 files changed, 30 insertions(+), 30 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 555a3bb7d8c..06be262750c 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
@@ -47,7 +47,7 @@ public final class
BroadcastRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public Optional<YamlBroadcastRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlBroadcastRuleConfiguration> 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())) {
diff --git
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapperTest.java
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapperTest.java
index b2664b22813..4afdbc39dc7 100644
---
a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapperTest.java
+++
b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/BroadcastRuleConfigurationRepositoryTupleSwapperTest.java
@@ -54,13 +54,13 @@ class BroadcastRuleConfigurationRepositoryTupleSwapperTest {
@Test
void assertSwapToObjectWithEmptyTuple() {
-
assertFalse(swapper.swapToObject0(Collections.emptyList()).isPresent());
+ assertFalse(swapper.swapToObject(Collections.emptyList()).isPresent());
}
@Test
void assertSwapToObject() {
RepositoryTuple repositoryTuple = new
RepositoryTuple("/metadata/foo_db/rules/broadcast/tables", "tables:\n-
foo_table\n- foo_table2\n");
- Optional<YamlBroadcastRuleConfiguration> actual =
swapper.swapToObject0(Collections.singleton(repositoryTuple));
+ Optional<YamlBroadcastRuleConfiguration> actual =
swapper.swapToObject(Collections.singleton(repositoryTuple));
assertTrue(actual.isPresent());
assertThat(actual.get().getTables().size(), is(2));
Iterator<String> iterator = actual.get().getTables().iterator();
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 e0bdd2c9331..a6ac19c395f 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
@@ -57,7 +57,7 @@ public final class
EncryptRuleConfigurationRepositoryTupleSwapper implements Rep
}
@Override
- public Optional<YamlEncryptRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlEncryptRuleConfiguration> 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();
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapperTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapperTest.java
index fe0fca2cdaf..8a0537d7c62 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapperTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapperTest.java
@@ -66,7 +66,7 @@ class EncryptRuleConfigurationRepositoryTupleSwapperTest {
@Test
void assertSwapToObjectWithEmptyTuple() {
-
assertFalse(swapper.swapToObject0(Collections.emptyList()).isPresent());
+ assertFalse(swapper.swapToObject(Collections.emptyList()).isPresent());
}
@Test
@@ -78,7 +78,7 @@ class EncryptRuleConfigurationRepositoryTupleSwapperTest {
+ " name: FIXTURE\n"
+ " name: foo_column\n"
+ "name: foo\n"), new
RepositoryTuple("/metadata/foo_db/rules/encrypt/encryptors/FOO/versions/0",
"type: FOO\n"));
- Optional<YamlEncryptRuleConfiguration> actual =
swapper.swapToObject0(repositoryTuples);
+ Optional<YamlEncryptRuleConfiguration> actual =
swapper.swapToObject(repositoryTuples);
assertTrue(actual.isPresent());
assertThat(actual.get().getTables().size(), is(1));
assertThat(actual.get().getTables().get("foo").getColumns().size(),
is(1));
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 bee9818f5af..cc7e811bec8 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
@@ -57,7 +57,7 @@ public final class
MaskRuleConfigurationRepositoryTupleSwapper implements Reposi
}
@Override
- public Optional<YamlMaskRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlMaskRuleConfiguration> 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();
diff --git
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapperTest.java
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapperTest.java
index 2e02bb5d1f9..17854bfb05a 100644
---
a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapperTest.java
+++
b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapperTest.java
@@ -64,7 +64,7 @@ class MaskRuleConfigurationRepositoryTupleSwapperTest {
@Test
void assertSwapToObjectWithEmptyTuple() {
- assertFalse(new
MaskRuleConfigurationRepositoryTupleSwapper().swapToObject0(new
LinkedList<>()).isPresent());
+ assertFalse(new
MaskRuleConfigurationRepositoryTupleSwapper().swapToObject(new
LinkedList<>()).isPresent());
}
@Test
@@ -75,7 +75,7 @@ class MaskRuleConfigurationRepositoryTupleSwapperTest {
+ " maskAlgorithm: FIXTURE\n"
+ "name: foo\n"),
new
RepositoryTuple("/metadata/foo_db/rules/mask/mask_algorithms/FIXTURE/versions/0",
"type: FIXTURE\n"));
- Optional<YamlMaskRuleConfiguration> actual = new
MaskRuleConfigurationRepositoryTupleSwapper().swapToObject0(repositoryTuples);
+ Optional<YamlMaskRuleConfiguration> actual = new
MaskRuleConfigurationRepositoryTupleSwapper().swapToObject(repositoryTuples);
assertTrue(actual.isPresent());
assertThat(actual.get().getTables().size(), is(1));
assertThat(actual.get().getTables().get("foo").getColumns().size(),
is(1));
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 32ce54006d8..7835e9c0f9a 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
@@ -59,7 +59,7 @@ public final class
ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper imp
}
@Override
- public Optional<YamlReadwriteSplittingRuleConfiguration>
swapToObject0(final Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlReadwriteSplittingRuleConfiguration>
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();
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest.java
index b8356c23018..9f993aa118f 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest.java
@@ -66,7 +66,7 @@ class
ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest {
@Test
void assertSwapToObjectWithEmptyTuple() {
-
assertFalse(swapper.swapToObject0(Collections.emptyList()).isPresent());
+ assertFalse(swapper.swapToObject(Collections.emptyList()).isPresent());
}
@Test
@@ -78,7 +78,7 @@ class
ReadwriteSplittingRuleConfigurationRepositoryTupleSwapperTest {
+ "transactionalReadQueryStrategy: DYNAMIC\n"
+ "writeDataSourceName: write_ds\n"),
new
RepositoryTuple("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random/versions/0",
"type: random\n"));
- Optional<YamlReadwriteSplittingRuleConfiguration> actual =
swapper.swapToObject0(repositoryTuples);
+ Optional<YamlReadwriteSplittingRuleConfiguration> actual =
swapper.swapToObject(repositoryTuples);
assertTrue(actual.isPresent());
assertThat(actual.get().getDataSourceGroups().size(), is(1));
assertThat(actual.get().getDataSourceGroups().get("foo_group").getWriteDataSourceName(),
is("write_ds"));
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 e19c537c47b..ac963c9fe9d 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
@@ -65,7 +65,7 @@ public final class
ShadowRuleConfigurationRepositoryTupleSwapper implements Repo
}
@Override
- public Optional<YamlShadowRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlShadowRuleConfiguration> 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();
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapperTest.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapperTest.java
index 079199922cf..067fdb28acb 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapperTest.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationRepositoryTupleSwapperTest.java
@@ -79,7 +79,7 @@ class ShadowRuleConfigurationRepositoryTupleSwapperTest {
@Test
void assertSwapToObjectWithEmptyTuple() {
-
assertFalse(swapper.swapToObject0(Collections.emptyList()).isPresent());
+ assertFalse(swapper.swapToObject(Collections.emptyList()).isPresent());
}
@Test
@@ -92,7 +92,7 @@ class ShadowRuleConfigurationRepositoryTupleSwapperTest {
+ "- FIXTURE\n"),
new
RepositoryTuple("/metadata/foo_db/rules/shadow/algorithms/FIXTURE/versions/0",
"type: FIXTURE\n"),
new
RepositoryTuple("/metadata/foo_db/rules/shadow/default_algorithm_name/versions/0",
"FIXTURE"));
- Optional<YamlShadowRuleConfiguration> actual =
swapper.swapToObject0(repositoryTuples);
+ Optional<YamlShadowRuleConfiguration> actual =
swapper.swapToObject(repositoryTuples);
assertTrue(actual.isPresent());
assertThat(actual.get().getDataSources().size(), is(1));
assertThat(actual.get().getDataSources().get("foo_db").getProductionDataSourceName(),
is("ds_0"));
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 85eb1bcc3ae..bbea7f4e98a 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
@@ -112,7 +112,7 @@ public final class
ShardingRuleConfigurationRepositoryTupleSwapper implements Re
}
@Override
- public Optional<YamlShardingRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlShardingRuleConfiguration> 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();
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapperTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapperTest.java
index 6dd9763601b..65ace548b4d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapperTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationRepositoryTupleSwapperTest.java
@@ -115,7 +115,7 @@ class ShardingRuleConfigurationRepositoryTupleSwapperTest {
@Test
void assertSwapToObjectWithEmptyTuple() {
-
assertFalse(swapper.swapToObject0(Collections.emptyList()).isPresent());
+ assertFalse(swapper.swapToObject(Collections.emptyList()).isPresent());
}
@Test
@@ -185,7 +185,7 @@ class ShardingRuleConfigurationRepositoryTupleSwapperTest {
repositoryTuples.add(new
RepositoryTuple("/metadata/foo_db/rules/sharding/key_generators/auto_increment/versions/0",
"type: AUTO_INCREMENT.FIXTURE\n"));
repositoryTuples.add(new
RepositoryTuple("/metadata/foo_db/rules/sharding/auditors/audit_algorithm/versions/0",
"type: DML_SHARDING_CONDITIONS\n"));
repositoryTuples.add(new
RepositoryTuple("/metadata/foo_db/rules/sharding/default_strategies/default_sharding_column/versions/0",
"table_id"));
- Optional<YamlShardingRuleConfiguration> yamlRuleConfig =
swapper.swapToObject0(repositoryTuples);
+ Optional<YamlShardingRuleConfiguration> yamlRuleConfig =
swapper.swapToObject(repositoryTuples);
assertTrue(yamlRuleConfig.isPresent());
ShardingRuleConfiguration actual = (ShardingRuleConfiguration) new
YamlRuleConfigurationSwapperEngine().swapToRuleConfiguration(yamlRuleConfig.get());
assertThat(actual.getTables().size(), is(2));
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 6e98d0b71df..a94512767b1 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
@@ -40,7 +40,7 @@ public final class
AuthorityRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public Optional<YamlAuthorityRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlAuthorityRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlAuthorityRuleConfiguration.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 8a5e71aeae7..a2279f97897 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
@@ -40,7 +40,7 @@ public final class
GlobalClockRuleConfigurationRepositoryTupleSwapper implements
}
@Override
- public Optional<YamlGlobalClockRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlGlobalClockRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlGlobalClockRuleConfiguration.class));
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 175da5c2244..bf0832f2ad9 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
@@ -40,7 +40,7 @@ public final class
LoggingRuleConfigurationRepositoryTupleSwapper implements Rep
}
@Override
- public Optional<YamlLoggingRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlLoggingRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlLoggingRuleConfiguration.class));
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
index 9b607ce5ef8..d4bf7cb58ea 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/RepositoryTupleSwapperEngine.java
@@ -48,7 +48,7 @@ public final class RepositoryTupleSwapperEngine {
Collection<RuleConfiguration> result = new LinkedList<>();
YamlRuleConfigurationSwapperEngine yamlSwapperEngine = new
YamlRuleConfigurationSwapperEngine();
for (RepositoryTupleSwapper each :
OrderedSPILoader.getServices(RepositoryTupleSwapper.class)) {
- each.swapToObject0(repositoryTuples).ifPresent(optional ->
result.add(yamlSwapperEngine.swapToRuleConfiguration((YamlRuleConfiguration)
optional)));
+ each.swapToObject(repositoryTuples).ifPresent(optional ->
result.add(yamlSwapperEngine.swapToRuleConfiguration((YamlRuleConfiguration)
optional)));
}
return result;
}
@@ -65,7 +65,7 @@ public final class RepositoryTupleSwapperEngine {
YamlRuleConfigurationSwapperEngine yamlSwapperEngine = new
YamlRuleConfigurationSwapperEngine();
for (RepositoryTupleSwapper each :
OrderedSPILoader.getServices(RepositoryTupleSwapper.class)) {
if (ruleName.equals(each.getRuleTagName().toLowerCase())) {
- Optional<YamlRuleConfiguration> yamlRuleConfig =
each.swapToObject0(repositoryTuples);
+ Optional<YamlRuleConfiguration> yamlRuleConfig =
each.swapToObject(repositoryTuples);
return
yamlRuleConfig.map(yamlSwapperEngine::swapToRuleConfiguration);
}
}
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 47bcd6320dc..6cc5c46940c 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
@@ -44,7 +44,7 @@ public final class
SingleRuleConfigurationRepositoryTupleSwapper implements Repo
}
@Override
- public Optional<YamlSingleRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlSingleRuleConfiguration> 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(YamlEngine.unmarshal(each.getValue(),
YamlSingleRuleConfiguration.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 4af317ae756..ff653e69fc8 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
@@ -40,7 +40,7 @@ public final class
SQLFederationRuleConfigurationRepositoryTupleSwapper implemen
}
@Override
- public Optional<YamlSQLFederationRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlSQLFederationRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlSQLFederationRuleConfiguration.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 c9be0832535..19395810466 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
@@ -40,7 +40,7 @@ public final class
SQLParserRuleConfigurationRepositoryTupleSwapper implements R
}
@Override
- public Optional<YamlSQLParserRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlSQLParserRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlSQLParserRuleConfiguration.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 11cfcbd02ec..176f45f2a6c 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
@@ -40,7 +40,7 @@ public final class
SQLTranslatorRuleConfigurationRepositoryTupleSwapper implemen
}
@Override
- public Optional<YamlSQLTranslatorRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlSQLTranslatorRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlSQLTranslatorRuleConfiguration.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 ac006b8ffd6..3d3e6133165 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
@@ -40,7 +40,7 @@ public final class
TrafficRuleConfigurationRepositoryTupleSwapper implements Rep
}
@Override
- public Optional<YamlTrafficRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlTrafficRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlTrafficRuleConfiguration.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 663e38b426e..ca2e6f0e813 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
@@ -40,7 +40,7 @@ public final class
TransactionRuleConfigurationRepositoryTupleSwapper implements
}
@Override
- public Optional<YamlTransactionRuleConfiguration> swapToObject0(final
Collection<RepositoryTuple> repositoryTuples) {
+ public Optional<YamlTransactionRuleConfiguration> swapToObject(final
Collection<RepositoryTuple> repositoryTuples) {
for (RepositoryTuple each : repositoryTuples) {
if (GlobalNodePath.getVersion(getRuleTagName().toLowerCase(),
each.getKey()).isPresent()) {
return Optional.of(YamlEngine.unmarshal(each.getValue(),
YamlTransactionRuleConfiguration.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 4dfc4dc72f3..8708fad12a5 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
@@ -49,7 +49,7 @@ public interface RepositoryTupleSwapper<T extends
RuleConfiguration, Y extends Y
* @param repositoryTuples repository tuples
* @return swapped YAML rule configurations
*/
- Optional<Y> swapToObject0(Collection<RepositoryTuple> repositoryTuples);
+ Optional<Y> swapToObject(Collection<RepositoryTuple> repositoryTuples);
/**
* Get YAML rule tag name.
