You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/06/25 07:54:53 UTC
[shardingsphere] branch master updated: Refactor rule swap in new swapper (#26531)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 400e1d3ac36 Refactor rule swap in new swapper (#26531)
400e1d3ac36 is described below
commit 400e1d3ac3697561a2e4af6f4bf0dc84b682032b
Author: ChenJiaHao <Pa...@163.com>
AuthorDate: Sun Jun 25 15:54:46 2023 +0800
Refactor rule swap in new swapper (#26531)
* Refactor rule swap in new swapper
* Fix CI
---
...lCompatibleEncryptRuleConfigurationSwapper.java | 6 ++--
.../NewYamlEncryptRuleConfigurationSwapper.java | 6 ++--
...patibleEncryptRuleConfigurationSwapperTest.java | 2 +-
...NewYamlEncryptRuleConfigurationSwapperTest.java | 2 +-
.../NewYamlMaskRuleConfigurationSwapper.java | 7 ++---
.../NewYamlMaskRuleConfigurationSwapperTest.java | 2 +-
...ReadwriteSplittingRuleConfigurationSwapper.java | 7 ++---
...writeSplittingRuleConfigurationSwapperTest.java | 2 +-
.../NewYamlShadowRuleConfigurationSwapper.java | 12 ++++----
.../NewYamlShadowRuleConfigurationSwapperTest.java | 4 +--
.../NewYamlShardingRuleConfigurationSwapper.java | 32 +++++++++++-----------
...ewYamlShardingRuleConfigurationSwapperTest.java | 16 +++++------
.../NewYamlSingleRuleConfigurationSwapper.java | 1 -
13 files changed, 48 insertions(+), 51 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java
index e96f583f35e..94f121ccff1 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapper.java
@@ -53,12 +53,12 @@ public final class NewYamlCompatibleEncryptRuleConfigurationSwapper implements N
@Override
public Collection<YamlDataNode> swapToDataNodes(final CompatibleEncryptRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
- for (EncryptTableRuleConfiguration each : data.getTables()) {
- result.add(new YamlDataNode(CompatibleEncryptNodeConverter.getTableNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
- }
for (Entry<String, AlgorithmConfiguration> entry : data.getEncryptors().entrySet()) {
result.add(new YamlDataNode(CompatibleEncryptNodeConverter.getEncryptorPath(entry.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
}
+ for (EncryptTableRuleConfiguration each : data.getTables()) {
+ result.add(new YamlDataNode(CompatibleEncryptNodeConverter.getTableNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
+ }
return result;
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java
index c42986d7ca3..15eb22f482d 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java
@@ -50,13 +50,13 @@ public final class NewYamlEncryptRuleConfigurationSwapper implements NewYamlRule
@Override
public Collection<YamlDataNode> swapToDataNodes(final EncryptRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
- for (EncryptTableRuleConfiguration each : data.getTables()) {
- result.add(new YamlDataNode(EncryptNodeConverter.getTableNodeConvertor().getNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
- }
for (Entry<String, AlgorithmConfiguration> entry : data.getEncryptors().entrySet()) {
result.add(new YamlDataNode(EncryptNodeConverter.getEncryptorNodeConvertor().getNamePath(entry.getKey()),
YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
}
+ for (EncryptTableRuleConfiguration each : data.getTables()) {
+ result.add(new YamlDataNode(EncryptNodeConverter.getTableNodeConvertor().getNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
+ }
return result;
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapperTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapperTest.java
index 09e20915f5d..ed33f83f3c0 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapperTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlCompatibleEncryptRuleConfigurationSwapperTest.java
@@ -52,8 +52,8 @@ class NewYamlCompatibleEncryptRuleConfigurationSwapperTest {
Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
assertThat(result.size(), is(2));
Iterator<YamlDataNode> iterator = result.iterator();
- assertThat(iterator.next().getKey(), is("tables/foo"));
assertThat(iterator.next().getKey(), is("encryptors/FOO"));
+ assertThat(iterator.next().getKey(), is("tables/foo"));
}
private CompatibleEncryptRuleConfiguration createMaximumEncryptRule() {
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapperTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapperTest.java
index 3b3dd6350d1..e26950640fb 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapperTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapperTest.java
@@ -51,8 +51,8 @@ class NewYamlEncryptRuleConfigurationSwapperTest {
Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
assertThat(result.size(), is(2));
Iterator<YamlDataNode> iterator = result.iterator();
- assertThat(iterator.next().getKey(), is("tables/foo"));
assertThat(iterator.next().getKey(), is("encryptors/FOO"));
+ assertThat(iterator.next().getKey(), is("tables/foo"));
}
private EncryptRuleConfiguration createMaximumEncryptRule() {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java
index ca2dd407de0..351d394f40b 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapper.java
@@ -35,7 +35,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map;
-import java.util.Map.Entry;
/**
* TODO Rename to YamlMaskRuleConfigurationSwapper when metadata structure adjustment completed.
@@ -50,12 +49,12 @@ public final class NewYamlMaskRuleConfigurationSwapper implements NewYamlRuleCon
@Override
public Collection<YamlDataNode> swapToDataNodes(final MaskRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
+ for (Map.Entry<String, AlgorithmConfiguration> entry : data.getMaskAlgorithms().entrySet()) {
+ result.add(new YamlDataNode(MaskNodeConverter.getMaskAlgorithmPath(entry.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
+ }
for (MaskTableRuleConfiguration each : data.getTables()) {
result.add(new YamlDataNode(MaskNodeConverter.getTableNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
}
- for (Entry<String, AlgorithmConfiguration> entry : data.getMaskAlgorithms().entrySet()) {
- result.add(new YamlDataNode(MaskNodeConverter.getMaskAlgorithmPath(entry.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
- }
return result;
}
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapperTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapperTest.java
index 5e8bc20f89f..d7ce591b38b 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapperTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/yaml/swapper/NewYamlMaskRuleConfigurationSwapperTest.java
@@ -50,8 +50,8 @@ class NewYamlMaskRuleConfigurationSwapperTest {
Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
assertThat(result.size(), is(2));
Iterator<YamlDataNode> iterator = result.iterator();
- assertThat(iterator.next().getKey(), is("tables/foo"));
assertThat(iterator.next().getKey(), is("algorithms/FIXTURE"));
+ assertThat(iterator.next().getKey(), is("tables/foo"));
}
private MaskRuleConfiguration createMaximumMaskRule() {
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
index 7947ac50e8f..063d6d4f4b3 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
@@ -36,7 +36,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map;
-import java.util.Map.Entry;
/**
* TODO Rename YamlReadwriteSplittingRuleConfigurationSwapper when metadata structure adjustment completed. #25485
@@ -49,12 +48,12 @@ public final class NewYamlReadwriteSplittingRuleConfigurationSwapper implements
@Override
public Collection<YamlDataNode> swapToDataNodes(final ReadwriteSplittingRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
+ for (Map.Entry<String, AlgorithmConfiguration> entry : data.getLoadBalancers().entrySet()) {
+ result.add(new YamlDataNode(ReadwriteSplittingNodeConverter.getLoadBalancerPath(entry.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
+ }
for (ReadwriteSplittingDataSourceRuleConfiguration each : data.getDataSources()) {
result.add(new YamlDataNode(ReadwriteSplittingNodeConverter.getGroupNamePath(each.getName()), YamlEngine.marshal(swapToYamlConfiguration(each))));
}
- for (Entry<String, AlgorithmConfiguration> entry : data.getLoadBalancers().entrySet()) {
- result.add(new YamlDataNode(ReadwriteSplittingNodeConverter.getLoadBalancerPath(entry.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
- }
return result;
}
diff --git a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
index 23159496dde..843406b7889 100644
--- a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
+++ b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
@@ -54,8 +54,8 @@ class NewYamlReadwriteSplittingRuleConfigurationSwapperTest {
Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
assertThat(result.size(), is(2));
Iterator<YamlDataNode> iterator = result.iterator();
- assertThat(iterator.next().getKey(), is("data_sources/group_0"));
assertThat(iterator.next().getKey(), is("load_balancers/random"));
+ assertThat(iterator.next().getKey(), is("data_sources/group_0"));
}
@Test
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java
index b6556725393..1bfff333c66 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapper.java
@@ -50,18 +50,18 @@ public final class NewYamlShadowRuleConfigurationSwapper implements NewYamlRuleC
@Override
public Collection<YamlDataNode> swapToDataNodes(final ShadowRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
- for (ShadowDataSourceConfiguration each : data.getDataSources()) {
- result.add(new YamlDataNode(ShadowNodeConverter.getDataSourcePath(each.getName()), YamlEngine.marshal(swapToDataSourceYamlConfiguration(each))));
- }
- for (Entry<String, ShadowTableConfiguration> entry : data.getTables().entrySet()) {
- result.add(new YamlDataNode(ShadowNodeConverter.getTableNamePath(entry.getKey()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(entry.getValue()))));
- }
for (Entry<String, AlgorithmConfiguration> entry : data.getShadowAlgorithms().entrySet()) {
result.add(new YamlDataNode(ShadowNodeConverter.getShadowAlgorithmPath(entry.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
}
if (!Strings.isNullOrEmpty(data.getDefaultShadowAlgorithmName())) {
result.add(new YamlDataNode(ShadowNodeConverter.getDefaultShadowAlgorithmPath(), data.getDefaultShadowAlgorithmName()));
}
+ for (ShadowDataSourceConfiguration each : data.getDataSources()) {
+ result.add(new YamlDataNode(ShadowNodeConverter.getDataSourcePath(each.getName()), YamlEngine.marshal(swapToDataSourceYamlConfiguration(each))));
+ }
+ for (Entry<String, ShadowTableConfiguration> entry : data.getTables().entrySet()) {
+ result.add(new YamlDataNode(ShadowNodeConverter.getTableNamePath(entry.getKey()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(entry.getValue()))));
+ }
return result;
}
diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapperTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapperTest.java
index cb4f3689658..eb3ff2249bc 100644
--- a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapperTest.java
+++ b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/NewYamlShadowRuleConfigurationSwapperTest.java
@@ -52,10 +52,10 @@ class NewYamlShadowRuleConfigurationSwapperTest {
Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
assertThat(result.size(), is(4));
Iterator<YamlDataNode> iterator = result.iterator();
- assertThat(iterator.next().getKey(), is("data_sources/foo"));
- assertThat(iterator.next().getKey(), is("tables/foo_table"));
assertThat(iterator.next().getKey(), is("algorithms/FIXTURE"));
assertThat(iterator.next().getKey(), is("default_algorithm_name"));
+ assertThat(iterator.next().getKey(), is("data_sources/foo"));
+ assertThat(iterator.next().getKey(), is("tables/foo_table"));
}
private ShadowRuleConfiguration createMaximumShadowRule() {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java
index a42ed67db25..25bb36672c5 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapper.java
@@ -70,9 +70,9 @@ public final class NewYamlShardingRuleConfigurationSwapper implements NewYamlRul
@Override
public Collection<YamlDataNode> swapToDataNodes(final ShardingRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
- swapTableRules(data, result);
- swapStrategies(data, result);
swapAlgorithms(data, result);
+ swapStrategies(data, result);
+ swapTableRules(data, result);
if (null != data.getDefaultShardingColumn()) {
result.add(new YamlDataNode(ShardingNodeConverter.getDefaultShardingColumnPath(), data.getDefaultShardingColumn()));
}
@@ -82,15 +82,15 @@ public final class NewYamlShardingRuleConfigurationSwapper implements NewYamlRul
return result;
}
- private void swapTableRules(final ShardingRuleConfiguration data, final Collection<YamlDataNode> result) {
- for (ShardingTableRuleConfiguration each : data.getTables()) {
- result.add(new YamlDataNode(ShardingNodeConverter.getTableNamePath(each.getLogicTable()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
+ private void swapAlgorithms(final ShardingRuleConfiguration data, final Collection<YamlDataNode> result) {
+ for (Entry<String, AlgorithmConfiguration> each : data.getShardingAlgorithms().entrySet()) {
+ result.add(new YamlDataNode(ShardingNodeConverter.getShardingAlgorithmPath(each.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(each.getValue()))));
}
- for (ShardingAutoTableRuleConfiguration each : data.getAutoTables()) {
- result.add(new YamlDataNode(ShardingNodeConverter.getAutoTableNamePath(each.getLogicTable()), YamlEngine.marshal(autoTableYamlSwapper.swapToYamlConfiguration(each))));
+ for (Entry<String, AlgorithmConfiguration> each : data.getKeyGenerators().entrySet()) {
+ result.add(new YamlDataNode(ShardingNodeConverter.getKeyGeneratorPath(each.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(each.getValue()))));
}
- for (ShardingTableReferenceRuleConfiguration each : data.getBindingTableGroups()) {
- result.add(new YamlDataNode(ShardingNodeConverter.getBindingTableNamePath(each.getName()), YamlShardingTableReferenceRuleConfigurationConverter.convertToYamlString(each)));
+ for (Entry<String, AlgorithmConfiguration> each : data.getAuditors().entrySet()) {
+ result.add(new YamlDataNode(ShardingNodeConverter.getAuditorPath(each.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(each.getValue()))));
}
}
@@ -113,15 +113,15 @@ public final class NewYamlShardingRuleConfigurationSwapper implements NewYamlRul
}
}
- private void swapAlgorithms(final ShardingRuleConfiguration data, final Collection<YamlDataNode> result) {
- for (Entry<String, AlgorithmConfiguration> each : data.getShardingAlgorithms().entrySet()) {
- result.add(new YamlDataNode(ShardingNodeConverter.getShardingAlgorithmPath(each.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(each.getValue()))));
+ private void swapTableRules(final ShardingRuleConfiguration data, final Collection<YamlDataNode> result) {
+ for (ShardingTableRuleConfiguration each : data.getTables()) {
+ result.add(new YamlDataNode(ShardingNodeConverter.getTableNamePath(each.getLogicTable()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
}
- for (Entry<String, AlgorithmConfiguration> each : data.getKeyGenerators().entrySet()) {
- result.add(new YamlDataNode(ShardingNodeConverter.getKeyGeneratorPath(each.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(each.getValue()))));
+ for (ShardingAutoTableRuleConfiguration each : data.getAutoTables()) {
+ result.add(new YamlDataNode(ShardingNodeConverter.getAutoTableNamePath(each.getLogicTable()), YamlEngine.marshal(autoTableYamlSwapper.swapToYamlConfiguration(each))));
}
- for (Entry<String, AlgorithmConfiguration> each : data.getAuditors().entrySet()) {
- result.add(new YamlDataNode(ShardingNodeConverter.getAuditorPath(each.getKey()), YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(each.getValue()))));
+ for (ShardingTableReferenceRuleConfiguration each : data.getBindingTableGroups()) {
+ result.add(new YamlDataNode(ShardingNodeConverter.getBindingTableNamePath(each.getName()), YamlShardingTableReferenceRuleConfigurationConverter.convertToYamlString(each)));
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapperTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapperTest.java
index eb335847b2e..bb54a89cd6d 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapperTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/NewYamlShardingRuleConfigurationSwapperTest.java
@@ -58,20 +58,20 @@ class NewYamlShardingRuleConfigurationSwapperTest {
Collection<YamlDataNode> result = swapper.swapToDataNodes(config);
assertThat(result.size(), is(15));
Iterator<YamlDataNode> iterator = result.iterator();
- assertThat(iterator.next().getKey(), is("tables/LOGIC_TABLE"));
- assertThat(iterator.next().getKey(), is("tables/SUB_LOGIC_TABLE"));
- assertThat(iterator.next().getKey(), is("auto_tables/auto_table"));
- assertThat(iterator.next().getKey(), is("binding_tables/foo"));
- assertThat(iterator.next().getKey(), is("default_strategies/default_database_strategy"));
- assertThat(iterator.next().getKey(), is("default_strategies/default_table_strategy"));
- assertThat(iterator.next().getKey(), is("default_strategies/default_key_generate_strategy"));
- assertThat(iterator.next().getKey(), is("default_strategies/default_audit_strategy"));
assertThat(iterator.next().getKey(), is("algorithms/core_standard_fixture"));
assertThat(iterator.next().getKey(), is("algorithms/hash_mod"));
assertThat(iterator.next().getKey(), is("key_generators/uuid"));
assertThat(iterator.next().getKey(), is("key_generators/default"));
assertThat(iterator.next().getKey(), is("key_generators/auto_increment"));
assertThat(iterator.next().getKey(), is("auditors/audit_algorithm"));
+ assertThat(iterator.next().getKey(), is("default_strategies/default_database_strategy"));
+ assertThat(iterator.next().getKey(), is("default_strategies/default_table_strategy"));
+ assertThat(iterator.next().getKey(), is("default_strategies/default_key_generate_strategy"));
+ assertThat(iterator.next().getKey(), is("default_strategies/default_audit_strategy"));
+ assertThat(iterator.next().getKey(), is("tables/LOGIC_TABLE"));
+ assertThat(iterator.next().getKey(), is("tables/SUB_LOGIC_TABLE"));
+ assertThat(iterator.next().getKey(), is("auto_tables/auto_table"));
+ assertThat(iterator.next().getKey(), is("binding_tables/foo"));
assertThat(iterator.next().getKey(), is("default_strategies/default_sharding_column"));
}
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java
index d353c0f1ac5..99a7867cfc8 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/yaml/config/swapper/NewYamlSingleRuleConfigurationSwapper.java
@@ -36,7 +36,6 @@ public final class NewYamlSingleRuleConfigurationSwapper implements NewYamlRuleC
@Override
public Collection<YamlDataNode> swapToDataNodes(final SingleRuleConfiguration data) {
- // TODO Consider whether to split tables and defaultDataSource
return Collections.singletonList(new YamlDataNode(SingleNodeConverter.getTablesPath(), YamlEngine.marshal(swapToYamlConfiguration(data))));
}