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/28 11:14:45 UTC
[shardingsphere] branch master updated: Refactor new YAML configuration swapper (#26663)
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 0697958e529 Refactor new YAML configuration swapper (#26663)
0697958e529 is described below
commit 0697958e529375986794839f53ff0130e50e5931
Author: ChenJiaHao <Pa...@163.com>
AuthorDate: Wed Jun 28 19:14:38 2023 +0800
Refactor new YAML configuration swapper (#26663)
* Refactor new YAML configuration swapper
* Fix UT
---
.../NewYamlBroadcastRuleConfigurationSwapper.java | 16 ++++++++--------
.../NewYamlBroadcastRuleConfigurationSwapperTest.java | 7 +++----
...YamlCompatibleEncryptRuleConfigurationSwapper.java | 19 +++++++++++--------
.../NewYamlEncryptRuleConfigurationSwapper.java | 18 +++++++++++-------
...CompatibleEncryptRuleConfigurationSwapperTest.java | 7 +++----
.../NewYamlEncryptRuleConfigurationSwapperTest.java | 7 +++----
.../swapper/NewYamlMaskRuleConfigurationSwapper.java | 15 +++++++++------
.../NewYamlMaskRuleConfigurationSwapperTest.java | 7 +++----
...amlReadwriteSplittingRuleConfigurationSwapper.java | 15 +++++++++------
...eadwriteSplittingRuleConfigurationSwapperTest.java | 7 +++----
.../NewYamlShadowRuleConfigurationSwapper.java | 15 +++++++++------
.../NewYamlShadowRuleConfigurationSwapperTest.java | 7 +++----
.../NewYamlShardingRuleConfigurationSwapper.java | 15 +++++++++------
.../NewYamlShardingRuleConfigurationSwapperTest.java | 5 ++---
.../NewYamlGlobalRuleConfigurationSwapperEngine.java | 4 ++--
.../rule/NewYamlRuleConfigurationSwapperEngine.java | 4 +---
.../yaml/swapper/NewYamlConfigurationSwapper.java | 3 ++-
.../NewYamlAuthorityRuleConfigurationSwapper.java | 6 +++---
.../NewYamlGlobalClockRuleConfigurationSwapper.java | 7 +++----
.../NewYamlLoggingRuleConfigurationSwapper.java | 6 +++---
.../NewYamlSingleRuleConfigurationSwapper.java | 16 ++++++++--------
.../NewYamlSQLFederationRuleConfigurationSwapper.java | 7 +++----
.../NewYamlSQLParserRuleConfigurationSwapper.java | 6 +++---
.../NewYamlSQLTranslatorRuleConfigurationSwapper.java | 7 +++----
.../NewYamlTrafficRuleConfigurationSwapper.java | 7 +++----
.../NewYamlTransactionRuleConfigurationSwapper.java | 7 +++----
26 files changed, 123 insertions(+), 117 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java
index 048611c2d08..682690ebf5f 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapper.java
@@ -28,6 +28,9 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfi
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename to YamlBroadcastRuleConfigurationSwapper when metadata structure adjustment completed.
@@ -48,18 +51,15 @@ public final class NewYamlBroadcastRuleConfigurationSwapper implements NewYamlRu
}
@Override
- public BroadcastRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> broadcastRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
- }
- for (YamlDataNode each : dataNodes) {
+ public Optional<BroadcastRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> broadcastRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ for (YamlDataNode each : validDataNodes) {
if (broadcastRuleNodePath.getRoot().isValidatedPath(each.getKey())) {
YamlBroadcastRuleConfiguration yamlBroadcastRuleConfiguration = YamlEngine.unmarshal(each.getValue(), YamlBroadcastRuleConfiguration.class);
- return new BroadcastRuleConfiguration(yamlBroadcastRuleConfiguration.getTables());
+ return Optional.of(new BroadcastRuleConfiguration(yamlBroadcastRuleConfiguration.getTables()));
}
}
- return new BroadcastRuleConfiguration(Collections.emptyList());
+ return Optional.empty();
}
@Override
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapperTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapperTest.java
index 5008e8fbb20..f9ee471eac0 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapperTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/yaml/swapper/NewYamlBroadcastRuleConfigurationSwapperTest.java
@@ -29,7 +29,7 @@ import java.util.LinkedList;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
class NewYamlBroadcastRuleConfigurationSwapperTest {
@@ -58,8 +58,7 @@ class NewYamlBroadcastRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- BroadcastRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -68,7 +67,7 @@ class NewYamlBroadcastRuleConfigurationSwapperTest {
config.add(new YamlDataNode("/metadata/foo_db/rules/broadcast/tables", "tables:\n"
+ "- foo_table\n"
+ "- foo_table2\n"));
- BroadcastRuleConfiguration result = swapper.swapToObject(config);
+ BroadcastRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getTables().size(), is(2));
Iterator<String> iterator = result.getTables().iterator();
assertThat(iterator.next(), is("foo_table"));
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 7e93453cafb..922a5c4a847 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
@@ -32,11 +32,14 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorit
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfigurationSwapper;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename to YamlCompatibleEncryptRuleConfigurationSwapper when metadata structure adjustment
@@ -68,20 +71,20 @@ public final class NewYamlCompatibleEncryptRuleConfigurationSwapper implements N
}
@Override
- public CompatibleEncryptRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> encryptRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
+ public Optional<CompatibleEncryptRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> encryptRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ if (validDataNodes.isEmpty()) {
+ return Optional.empty();
}
Collection<EncryptTableRuleConfiguration> tables = new LinkedList<>();
- Map<String, AlgorithmConfiguration> encryptors = new HashMap<>();
- for (YamlDataNode each : dataNodes) {
+ Map<String, AlgorithmConfiguration> encryptors = new LinkedHashMap<>();
+ for (YamlDataNode each : validDataNodes) {
encryptRuleNodePath.getNamedItem(CompatibleEncryptRuleNodePathProvider.TABLES).getName(each.getKey())
.ifPresent(optional -> tables.add(tableSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlCompatibleEncryptTableRuleConfiguration.class))));
encryptRuleNodePath.getNamedItem(CompatibleEncryptRuleNodePathProvider.ENCRYPTORS).getName(each.getKey())
.ifPresent(optional -> encryptors.put(optional, algorithmSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class))));
}
- return new CompatibleEncryptRuleConfiguration(tables, encryptors);
+ return Optional.of(new CompatibleEncryptRuleConfiguration(tables, encryptors));
}
@Override
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 d23683f479e..9c8c950b300 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
@@ -32,11 +32,14 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorit
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfigurationSwapper;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename to YamlEncryptRuleConfigurationSwapper when metadata structure adjustment completed.
@@ -65,19 +68,20 @@ public final class NewYamlEncryptRuleConfigurationSwapper implements NewYamlRule
}
@Override
- public EncryptRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> encryptRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- return null;
+ public Optional<EncryptRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> encryptRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ if (validDataNodes.isEmpty()) {
+ return Optional.empty();
}
Collection<EncryptTableRuleConfiguration> tables = new LinkedList<>();
- Map<String, AlgorithmConfiguration> encryptors = new HashMap<>();
- for (YamlDataNode each : dataNodes) {
+ Map<String, AlgorithmConfiguration> encryptors = new LinkedHashMap<>();
+ for (YamlDataNode each : validDataNodes) {
encryptRuleNodePath.getNamedItem(EncryptRuleNodePathProvider.TABLES).getName(each.getKey())
.ifPresent(optional -> tables.add(tableSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlEncryptTableRuleConfiguration.class))));
encryptRuleNodePath.getNamedItem(EncryptRuleNodePathProvider.ENCRYPTORS).getName(each.getKey())
.ifPresent(optional -> encryptors.put(optional, algorithmSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class))));
}
- return new EncryptRuleConfiguration(tables, encryptors);
+ return Optional.of(new EncryptRuleConfiguration(tables, encryptors));
}
@Override
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 7436dcfd550..99fd320abdb 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
@@ -33,7 +33,7 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
@Deprecated
class NewYamlCompatibleEncryptRuleConfigurationSwapperTest {
@@ -66,8 +66,7 @@ class NewYamlCompatibleEncryptRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- CompatibleEncryptRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -80,7 +79,7 @@ class NewYamlCompatibleEncryptRuleConfigurationSwapperTest {
+ " logicColumn: foo_column\n"
+ "name: foo\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/compatible_encrypt/encryptors/FOO/versions/0", "type: FOO\n"));
- CompatibleEncryptRuleConfiguration result = swapper.swapToObject(config);
+ CompatibleEncryptRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getTables().size(), is(1));
assertThat(result.getTables().iterator().next().getName(), is("foo"));
assertThat(result.getTables().iterator().next().getColumns().size(), is(1));
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 ab1302f1dc1..c18ca95a0a4 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
@@ -33,7 +33,7 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
class NewYamlEncryptRuleConfigurationSwapperTest {
@@ -65,8 +65,7 @@ class NewYamlEncryptRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- EncryptRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -80,7 +79,7 @@ class NewYamlEncryptRuleConfigurationSwapperTest {
+ " name: foo_column\n"
+ "name: foo\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/encrypt/encryptors/FOO/versions/0", "type: FOO\n"));
- EncryptRuleConfiguration result = swapper.swapToObject(config);
+ EncryptRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getTables().size(), is(1));
assertThat(result.getTables().iterator().next().getName(), is("foo"));
assertThat(result.getTables().iterator().next().getColumns().size(), is(1));
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 bcaab7fbcf9..ca3ae6072d4 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,8 +35,11 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename to YamlMaskRuleConfigurationSwapper when metadata structure adjustment completed.
@@ -64,20 +67,20 @@ public final class NewYamlMaskRuleConfigurationSwapper implements NewYamlRuleCon
}
@Override
- public MaskRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> maskRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
+ public Optional<MaskRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> maskRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ if (validDataNodes.isEmpty()) {
+ return Optional.empty();
}
Collection<MaskTableRuleConfiguration> tables = new LinkedList<>();
Map<String, AlgorithmConfiguration> algorithms = new LinkedHashMap<>();
- for (YamlDataNode each : dataNodes) {
+ for (YamlDataNode each : validDataNodes) {
maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.TABLES).getName(each.getKey())
.ifPresent(optional -> tables.add(tableSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlMaskTableRuleConfiguration.class))));
maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.ALGORITHMS).getName(each.getKey())
.ifPresent(optional -> algorithms.put(optional, algorithmSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class))));
}
- return new MaskRuleConfiguration(tables, algorithms);
+ return Optional.of(new MaskRuleConfiguration(tables, algorithms));
}
@Override
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 b83388921f6..3067df7de94 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
@@ -32,7 +32,7 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
class NewYamlMaskRuleConfigurationSwapperTest {
@@ -64,8 +64,7 @@ class NewYamlMaskRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- MaskRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -77,7 +76,7 @@ class NewYamlMaskRuleConfigurationSwapperTest {
+ " maskAlgorithm: FIXTURE\n"
+ "name: foo\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/mask/algorithms/FIXTURE/versions/0", "type: FIXTURE\n"));
- MaskRuleConfiguration result = swapper.swapToObject(config);
+ MaskRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getTables().size(), is(1));
assertThat(result.getTables().iterator().next().getName(), is("foo"));
assertThat(result.getTables().iterator().next().getColumns().size(), is(1));
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 cfac999baaf..5be7b504db0 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,8 +36,11 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename YamlReadwriteSplittingRuleConfigurationSwapper when metadata structure adjustment completed. #25485
@@ -73,20 +76,20 @@ public final class NewYamlReadwriteSplittingRuleConfigurationSwapper implements
}
@Override
- public ReadwriteSplittingRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> readwriteSplittingRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
+ public Optional<ReadwriteSplittingRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> readwriteSplittingRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ if (validDataNodes.isEmpty()) {
+ return Optional.empty();
}
Collection<ReadwriteSplittingDataSourceRuleConfiguration> dataSources = new LinkedList<>();
Map<String, AlgorithmConfiguration> loadBalancerMap = new LinkedHashMap<>();
- for (YamlDataNode each : dataNodes) {
+ for (YamlDataNode each : validDataNodes) {
readwriteSplittingRuleNodePath.getNamedItem(ReadwriteSplittingRuleNodePathProvider.DATA_SOURCES).getName(each.getKey())
.ifPresent(optional -> dataSources.add(swapDataSource(optional, YamlEngine.unmarshal(each.getValue(), YamlReadwriteSplittingDataSourceRuleConfiguration.class))));
readwriteSplittingRuleNodePath.getNamedItem(ReadwriteSplittingRuleNodePathProvider.LOAD_BALANCERS).getName(each.getKey())
.ifPresent(optional -> loadBalancerMap.put(optional, algorithmSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class))));
}
- return new ReadwriteSplittingRuleConfiguration(dataSources, loadBalancerMap);
+ return Optional.of(new ReadwriteSplittingRuleConfiguration(dataSources, loadBalancerMap));
}
private ReadwriteSplittingDataSourceRuleConfiguration swapDataSource(final String name, final YamlReadwriteSplittingDataSourceRuleConfiguration yamlDataSourceRuleConfig) {
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 cd9a63b96ee..56bc5f9f0b6 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
@@ -33,7 +33,7 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
class NewYamlReadwriteSplittingRuleConfigurationSwapperTest {
@@ -62,8 +62,7 @@ class NewYamlReadwriteSplittingRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- ReadwriteSplittingRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -76,7 +75,7 @@ class NewYamlReadwriteSplittingRuleConfigurationSwapperTest {
+ "transactionalReadQueryStrategy: DYNAMIC\n"
+ "writeDataSourceName: write_ds\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random/versions/0", "type: random\n"));
- ReadwriteSplittingRuleConfiguration result = swapper.swapToObject(config);
+ ReadwriteSplittingRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getDataSources().size(), is(1));
assertThat(result.getDataSources().iterator().next().getName(), is("group_0"));
assertThat(result.getDataSources().iterator().next().getWriteDataSourceName(), is("write_ds"));
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 8ecda3be8fc..2c010477d01 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
@@ -36,7 +36,10 @@ import org.apache.shardingsphere.shadow.yaml.swapper.table.YamlShadowTableConfig
import java.util.Collection;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename YamlShadowRuleConfigurationSwapper when metadata structure adjustment completed.
@@ -79,13 +82,13 @@ public final class NewYamlShadowRuleConfigurationSwapper implements NewYamlRuleC
}
@Override
- public ShadowRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> shadowRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
+ public Optional<ShadowRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> shadowRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ if (validDataNodes.isEmpty()) {
+ return Optional.empty();
}
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
- for (YamlDataNode each : dataNodes) {
+ for (YamlDataNode each : validDataNodes) {
shadowRuleNodePath.getNamedItem(ShadowRuleNodePathProvider.DATA_SOURCES).getName(each.getKey())
.ifPresent(optional -> result.getDataSources().add(swapDataSource(optional, YamlEngine.unmarshal(each.getValue(), YamlShadowDataSourceConfiguration.class))));
shadowRuleNodePath.getNamedItem(ShadowRuleNodePathProvider.TABLES).getName(each.getKey())
@@ -96,7 +99,7 @@ public final class NewYamlShadowRuleConfigurationSwapper implements NewYamlRuleC
result.setDefaultShadowAlgorithmName(each.getValue());
}
}
- return result;
+ return Optional.of(result);
}
private ShadowDataSourceConfiguration swapDataSource(final String name, final YamlShadowDataSourceConfiguration yamlConfig) {
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 bf51b316536..c4db9d879f2 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
@@ -34,7 +34,7 @@ import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
class NewYamlShadowRuleConfigurationSwapperTest {
@@ -77,8 +77,7 @@ class NewYamlShadowRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- ShadowRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -92,7 +91,7 @@ class NewYamlShadowRuleConfigurationSwapperTest {
+ "- FIXTURE\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/shadow/algorithms/FIXTURE/versions/0", "type: FIXTURE\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/shadow/default_algorithm_name/versions/0", "FIXTURE"));
- ShadowRuleConfiguration result = swapper.swapToObject(config);
+ ShadowRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getDataSources().size(), is(1));
assertThat(result.getDataSources().iterator().next().getName(), is("foo_db"));
assertThat(result.getDataSources().iterator().next().getProductionDataSourceName(), is("ds_0"));
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 99606f0b933..3cab9a4ddce 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
@@ -46,7 +46,10 @@ import org.apache.shardingsphere.sharding.yaml.swapper.strategy.YamlShardingStra
import java.util.Collection;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename to YamlShardingRuleConfigurationSwapper when metadata structure adjustment completed. #25485
@@ -136,13 +139,13 @@ public final class NewYamlShardingRuleConfigurationSwapper implements NewYamlRul
}
@Override
- public ShardingRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> shardingRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
+ public Optional<ShardingRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> shardingRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ if (validDataNodes.isEmpty()) {
+ return Optional.empty();
}
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
- for (YamlDataNode each : dataNodes) {
+ for (YamlDataNode each : validDataNodes) {
shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.TABLES).getName(each.getKey())
.ifPresent(optional -> result.getTables().add(tableSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTableRuleConfiguration.class))));
shardingRuleNodePath.getNamedItem(ShardingRuleNodePathProvider.AUTO_TABLES).getName(each.getKey())
@@ -169,7 +172,7 @@ public final class NewYamlShardingRuleConfigurationSwapper implements NewYamlRul
result.setShardingCache(shardingCacheYamlSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlShardingCacheConfiguration.class)));
}
}
- return result;
+ return Optional.of(result);
}
@Override
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 88f1016bf2f..144b201f933 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
@@ -114,8 +114,7 @@ class NewYamlShardingRuleConfigurationSwapperTest {
@Test
void assertSwapToObjectEmpty() {
Collection<YamlDataNode> config = new LinkedList<>();
- ShardingRuleConfiguration result = swapper.swapToObject(config);
- assertTrue(result == null);
+ assertFalse(swapper.swapToObject(config).isPresent());
}
@Test
@@ -185,7 +184,7 @@ class NewYamlShardingRuleConfigurationSwapperTest {
config.add(new YamlDataNode("/metadata/foo_db/rules/sharding/key_generators/auto_increment/versions/0", "type: AUTO_INCREMENT.FIXTURE\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/sharding/auditors/audit_algorithm/versions/0", "type: DML_SHARDING_CONDITIONS\n"));
config.add(new YamlDataNode("/metadata/foo_db/rules/sharding/default_strategies/default_sharding_column/versions/0", "table_id"));
- ShardingRuleConfiguration result = swapper.swapToObject(config);
+ ShardingRuleConfiguration result = swapper.swapToObject(config).get();
assertThat(result.getTables().size(), is(2));
assertThat(result.getTables().iterator().next().getLogicTable(), is("LOGIC_TABLE"));
assertThat(result.getTables().iterator().next().getActualDataNodes(), is("ds_${0..1}.table_${0..2}"));
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlGlobalRuleConfigurationSwapperEngine.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlGlobalRuleConfigurationSwapperEngine.java
index 455f510febe..8ea728e09cc 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlGlobalRuleConfigurationSwapperEngine.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlGlobalRuleConfigurationSwapperEngine.java
@@ -53,7 +53,7 @@ public final class NewYamlGlobalRuleConfigurationSwapperEngine {
public Collection<RuleConfiguration> swapToRuleConfigurations(final Collection<YamlDataNode> dataNodes) {
Collection<RuleConfiguration> result = new LinkedList<>();
for (NewYamlGlobalRuleConfigurationSwapper each : OrderedSPILoader.getServices(NewYamlGlobalRuleConfigurationSwapper.class)) {
- result.add((RuleConfiguration) each.swapToObject(dataNodes));
+ each.swapToObject(dataNodes).ifPresent(optional -> result.add((RuleConfiguration) optional));
}
return result;
}
@@ -69,7 +69,7 @@ public final class NewYamlGlobalRuleConfigurationSwapperEngine {
public Optional<RuleConfiguration> swapSingleRuleToRuleConfiguration(final String ruleName, final Collection<YamlDataNode> dataNodes) {
for (NewYamlGlobalRuleConfigurationSwapper each : OrderedSPILoader.getServices(NewYamlGlobalRuleConfigurationSwapper.class)) {
if (ruleName.equals(each.getRuleTagName().toLowerCase())) {
- return Optional.of((RuleConfiguration) each.swapToObject(dataNodes));
+ return each.swapToObject(dataNodes);
}
}
return Optional.empty();
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlRuleConfigurationSwapperEngine.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlRuleConfigurationSwapperEngine.java
index d7429570d32..09fd04413a2 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlRuleConfigurationSwapperEngine.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/rule/NewYamlRuleConfigurationSwapperEngine.java
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
-import java.util.Objects;
/**
* TODO Rename YamlRuleConfigurationSwapper when metadata structure adjustment completed. #25485
@@ -53,9 +52,8 @@ public final class NewYamlRuleConfigurationSwapperEngine {
public Collection<RuleConfiguration> swapToRuleConfigurations(final Collection<YamlDataNode> dataNodes) {
Collection<RuleConfiguration> result = new LinkedList<>();
for (NewYamlRuleConfigurationSwapper each : OrderedSPILoader.getServices(NewYamlRuleConfigurationSwapper.class)) {
- result.add((RuleConfiguration) each.swapToObject(dataNodes));
+ each.swapToObject(dataNodes).ifPresent(optional -> result.add((RuleConfiguration) optional));
}
- result.removeIf(Objects::isNull);
return result;
}
}
diff --git a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/swapper/NewYamlConfigurationSwapper.java b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/swapper/NewYamlConfigurationSwapper.java
index 1e2ee2f7542..cd28e83940d 100644
--- a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/swapper/NewYamlConfigurationSwapper.java
+++ b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/yaml/swapper/NewYamlConfigurationSwapper.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.infra.util.yaml.swapper;
import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
import java.util.Collection;
+import java.util.Optional;
/**
* TODO Rename YamlConfigurationSwapper when metadata structure adjustment completed. #25485
@@ -43,5 +44,5 @@ public interface NewYamlConfigurationSwapper<T> {
* @param dataNodes data nodes
* @return swapped object
*/
- T swapToObject(Collection<YamlDataNode> dataNodes);
+ Optional<T> swapToObject(Collection<YamlDataNode> dataNodes);
}
diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/NewYamlAuthorityRuleConfigurationSwapper.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/NewYamlAuthorityRuleConfigurationSwapper.java
index 55bf68f28e1..6e2d0408dd5 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/NewYamlAuthorityRuleConfigurationSwapper.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/NewYamlAuthorityRuleConfigurationSwapper.java
@@ -59,15 +59,15 @@ public final class NewYamlAuthorityRuleConfigurationSwapper implements NewYamlGl
}
@Override
- public AuthorityRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<AuthorityRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAuthorityRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAuthorityRuleConfiguration.class)));
}
- return new DefaultAuthorityRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private AuthorityRuleConfiguration swapToObject(final YamlAuthorityRuleConfiguration yamlConfig) {
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/NewYamlGlobalClockRuleConfigurationSwapper.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/NewYamlGlobalClockRuleConfigurationSwapper.java
index 0e2ce4de0f9..8d64c7ab11e 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/NewYamlGlobalClockRuleConfigurationSwapper.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/yaml/swapper/NewYamlGlobalClockRuleConfigurationSwapper.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.globalclock.core.yaml.swapper;
import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
-import org.apache.shardingsphere.globalclock.core.rule.builder.DefaultGlobalClockRuleConfigurationBuilder;
import org.apache.shardingsphere.globalclock.core.rule.constant.GlobalClockOrder;
import org.apache.shardingsphere.globalclock.core.yaml.config.YamlGlobalClockRuleConfiguration;
import org.apache.shardingsphere.infra.config.nodepath.GlobalNodePath;
@@ -52,15 +51,15 @@ public final class NewYamlGlobalClockRuleConfigurationSwapper implements NewYaml
}
@Override
- public GlobalClockRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<GlobalClockRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlGlobalClockRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlGlobalClockRuleConfiguration.class)));
}
- return new DefaultGlobalClockRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private GlobalClockRuleConfiguration swapToObject(final YamlGlobalClockRuleConfiguration yamlConfig) {
diff --git a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/NewYamlLoggingRuleConfigurationSwapper.java b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/NewYamlLoggingRuleConfigurationSwapper.java
index 03ed8df9994..f4a056c1478 100644
--- a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/NewYamlLoggingRuleConfigurationSwapper.java
+++ b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/NewYamlLoggingRuleConfigurationSwapper.java
@@ -51,15 +51,15 @@ public final class NewYamlLoggingRuleConfigurationSwapper implements NewYamlGlob
}
@Override
- public LoggingRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<LoggingRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlLoggingRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlLoggingRuleConfiguration.class)));
}
- return getDefaultLoggingRuleConfiguration();
+ return Optional.empty();
}
private LoggingRuleConfiguration swapToObject(final YamlLoggingRuleConfiguration yamlConfig) {
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 ef038acfc11..803bd764fef 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
@@ -28,6 +28,9 @@ import org.apache.shardingsphere.single.yaml.config.pojo.YamlSingleRuleConfigura
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* TODO Rename YamlSingleRuleConfigurationSwapper when metadata structure adjustment completed. #25485
@@ -50,17 +53,14 @@ public final class NewYamlSingleRuleConfigurationSwapper implements NewYamlRuleC
}
@Override
- public SingleRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
- if (dataNodes.stream().noneMatch(each -> singleRuleNodePath.getRoot().isValidatedPath(each.getKey()))) {
- // TODO refactor this use Optional
- return null;
- }
- for (YamlDataNode each : dataNodes) {
+ public Optional<SingleRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
+ List<YamlDataNode> validDataNodes = dataNodes.stream().filter(each -> singleRuleNodePath.getRoot().isValidatedPath(each.getKey())).collect(Collectors.toList());
+ for (YamlDataNode each : validDataNodes) {
if (singleRuleNodePath.getUniqueItem(SingleRuleNodePathProvider.TABLES).isValidatedPath(each.getKey())) {
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSingleRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSingleRuleConfiguration.class)));
}
}
- return new SingleRuleConfiguration();
+ return Optional.empty();
}
private SingleRuleConfiguration swapToObject(final YamlSingleRuleConfiguration yamlConfig) {
diff --git a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/NewYamlSQLFederationRuleConfigurationSwapper.java b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/NewYamlSQLFederationRuleConfigurationSwapper.java
index d92ec6d3233..bfcbfe56053 100644
--- a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/NewYamlSQLFederationRuleConfigurationSwapper.java
+++ b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/yaml/swapper/NewYamlSQLFederationRuleConfigurationSwapper.java
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlGlobalRul
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sqlfederation.api.config.SQLFederationRuleConfiguration;
import org.apache.shardingsphere.sqlfederation.constant.SQLFederationOrder;
-import org.apache.shardingsphere.sqlfederation.rule.builder.DefaultSQLFederationRuleConfigurationBuilder;
import org.apache.shardingsphere.sqlfederation.yaml.config.YamlSQLFederationRuleConfiguration;
import java.util.Collection;
@@ -52,15 +51,15 @@ public final class NewYamlSQLFederationRuleConfigurationSwapper implements NewYa
}
@Override
- public SQLFederationRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<SQLFederationRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLFederationRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLFederationRuleConfiguration.class)));
}
- return new DefaultSQLFederationRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private SQLFederationRuleConfiguration swapToObject(final YamlSQLFederationRuleConfiguration yamlConfig) {
diff --git a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/NewYamlSQLParserRuleConfigurationSwapper.java b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/NewYamlSQLParserRuleConfigurationSwapper.java
index 271ae81364a..920152a81d8 100644
--- a/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/NewYamlSQLParserRuleConfigurationSwapper.java
+++ b/kernel/sql-parser/core/src/main/java/org/apache/shardingsphere/parser/yaml/swapper/NewYamlSQLParserRuleConfigurationSwapper.java
@@ -53,15 +53,15 @@ public final class NewYamlSQLParserRuleConfigurationSwapper implements NewYamlGl
}
@Override
- public SQLParserRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<SQLParserRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLParserRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLParserRuleConfiguration.class)));
}
- return new DefaultSQLParserRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private SQLParserRuleConfiguration swapToObject(final YamlSQLParserRuleConfiguration yamlConfig) {
diff --git a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/NewYamlSQLTranslatorRuleConfigurationSwapper.java b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/NewYamlSQLTranslatorRuleConfigurationSwapper.java
index 11298aab7b2..1ca7e458354 100644
--- a/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/NewYamlSQLTranslatorRuleConfigurationSwapper.java
+++ b/kernel/sql-translator/core/src/main/java/org/apache/shardingsphere/sqltranslator/yaml/swapper/NewYamlSQLTranslatorRuleConfigurationSwapper.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlGlobalRuleConfigurationSwapper;
import org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration;
import org.apache.shardingsphere.sqltranslator.constant.SQLTranslatorOrder;
-import org.apache.shardingsphere.sqltranslator.rule.builder.DefaultSQLTranslatorRuleConfigurationBuilder;
import org.apache.shardingsphere.sqltranslator.yaml.config.YamlSQLTranslatorRuleConfiguration;
import java.util.Collection;
@@ -49,15 +48,15 @@ public final class NewYamlSQLTranslatorRuleConfigurationSwapper implements NewYa
}
@Override
- public SQLTranslatorRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<SQLTranslatorRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLTranslatorRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlSQLTranslatorRuleConfiguration.class)));
}
- return new DefaultSQLTranslatorRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private SQLTranslatorRuleConfiguration swapToObject(final YamlSQLTranslatorRuleConfiguration yamlConfig) {
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/NewYamlTrafficRuleConfigurationSwapper.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/NewYamlTrafficRuleConfigurationSwapper.java
index 24e520624cd..b9f1689e949 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/NewYamlTrafficRuleConfigurationSwapper.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/yaml/swapper/NewYamlTrafficRuleConfigurationSwapper.java
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorit
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlGlobalRuleConfigurationSwapper;
import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration;
import org.apache.shardingsphere.traffic.constant.TrafficOrder;
-import org.apache.shardingsphere.traffic.rule.builder.DefaultTrafficRuleConfigurationBuilder;
import org.apache.shardingsphere.traffic.yaml.config.YamlTrafficRuleConfiguration;
import org.apache.shardingsphere.traffic.yaml.config.YamlTrafficStrategyConfiguration;
@@ -65,15 +64,15 @@ public final class NewYamlTrafficRuleConfigurationSwapper implements NewYamlGlob
}
@Override
- public TrafficRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<TrafficRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTrafficRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTrafficRuleConfiguration.class)));
}
- return new DefaultTrafficRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private TrafficRuleConfiguration swapToObject(final YamlTrafficRuleConfiguration yamlConfig) {
diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java
index fec0ff33b20..42a73ff60ba 100644
--- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java
+++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/yaml/swapper/NewYamlTransactionRuleConfigurationSwapper.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlGlobalRuleConfigurationSwapper;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.apache.shardingsphere.transaction.constant.TransactionOrder;
-import org.apache.shardingsphere.transaction.rule.builder.DefaultTransactionRuleConfigurationBuilder;
import org.apache.shardingsphere.transaction.yaml.config.YamlTransactionRuleConfiguration;
import java.util.Collection;
@@ -51,15 +50,15 @@ public final class NewYamlTransactionRuleConfigurationSwapper implements NewYaml
}
@Override
- public TransactionRuleConfiguration swapToObject(final Collection<YamlDataNode> dataNodes) {
+ public Optional<TransactionRuleConfiguration> swapToObject(final Collection<YamlDataNode> dataNodes) {
for (YamlDataNode each : dataNodes) {
Optional<String> version = GlobalNodePath.getVersion(getRuleTagName().toLowerCase(), each.getKey());
if (!version.isPresent()) {
continue;
}
- return swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTransactionRuleConfiguration.class));
+ return Optional.of(swapToObject(YamlEngine.unmarshal(each.getValue(), YamlTransactionRuleConfiguration.class)));
}
- return new DefaultTransactionRuleConfigurationBuilder().build();
+ return Optional.empty();
}
private TransactionRuleConfiguration swapToObject(final YamlTransactionRuleConfiguration yamlConfig) {