This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 b24942a1429 Refactor
DatabaseRuleNodePath.createRuleItemNameSearchCriteria() (#34903)
b24942a1429 is described below
commit b24942a1429cbcce3b21a4a11b6ce9c56270b965
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Mar 6 14:31:47 2025 +0800
Refactor DatabaseRuleNodePath.createRuleItemNameSearchCriteria() (#34903)
* Fix javadoc on DatabaseChangedHandler
* Refactor DatabaseRuleNodePath.createRuleItemNameSearchCriteria()
---
.../metadata/changed/RuleItemChangedNodePathBuilder.java | 2 +-
.../node/path/type/metadata/rule/DatabaseRuleNodePath.java | 5 ++---
.../path/type/metadata/rule/DatabaseRuleNodePathTest.java | 13 +++++--------
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
index 953f73d460e..beaadb78b49 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
@@ -45,7 +45,7 @@ public final class RuleItemChangedNodePathBuilder {
}
DatabaseRuleNode databaseRuleNode =
DatabaseRuleNodeGenerator.generate(ruleType.get());
for (String each : databaseRuleNode.getNamedItems()) {
- Optional<String> itemName = NodePathSearcher.find(path,
DatabaseRuleNodePath.createRuleItemNameSearchCriteria(databaseName,
databaseRuleNode.getRuleType(), each, true));
+ Optional<String> itemName = NodePathSearcher.find(path,
DatabaseRuleNodePath.createRuleItemNameSearchCriteria(databaseName,
databaseRuleNode.getRuleType(), each));
if (!itemName.isPresent()) {
continue;
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
index c4aa960c5a5..f0c0c7a45d2 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
@@ -54,10 +54,9 @@ public final class DatabaseRuleNodePath implements NodePath {
* @param databaseName database name
* @param ruleType rule type
* @param ruleItemType rule item type
- * @param containsChildPath contains child path
* @return create search criteria
*/
- public static NodePathSearchCriteria
createRuleItemNameSearchCriteria(final String databaseName, final String
ruleType, final String ruleItemType, final boolean containsChildPath) {
- return new NodePathSearchCriteria(new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType,
NodePathPattern.QUALIFIED_IDENTIFIER)), false, containsChildPath, 1);
+ public static NodePathSearchCriteria
createRuleItemNameSearchCriteria(final String databaseName, final String
ruleType, final String ruleItemType) {
+ return new NodePathSearchCriteria(new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType,
NodePathPattern.QUALIFIED_IDENTIFIER)), false, true, 1);
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
index f8c349fc4df..99b185450eb 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
@@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
class DatabaseRuleNodePathTest {
@@ -50,14 +49,12 @@ class DatabaseRuleNodePathTest {
@Test
void assertCreateRuleItemNameSearchCriteria() {
assertThat(NodePathSearcher.get("/metadata/foo_db/rules/foo_rule/foo_rule_item/item_value",
-
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item", false)), is("item_value"));
+
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item")), is("item_value"));
+
assertThat(NodePathSearcher.get("/metadata/foo_db/rules/foo_rule/foo_rule_item/item_value/versions/0",
+
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item")), is("item_value"));
assertFalse(NodePathSearcher.find("/metadata/foo_db/rules/foo_rule/foo_rule_item",
-
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item", false)).isPresent());
+
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item")).isPresent());
assertFalse(NodePathSearcher.find("/metadata/foo_db/rules/bar_rule/foo_rule_item/item_value",
-
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item", false)).isPresent());
-
assertTrue(NodePathSearcher.find("/metadata/foo_db/rules/foo_rule/foo_rule_item/item_value/versions/0",
-
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item", true)).isPresent());
-
assertFalse(NodePathSearcher.find("/metadata/foo_db/rules/foo_rule/foo_rule_item/item_value/versions/0",
-
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item", false)).isPresent());
+
DatabaseRuleNodePath.createRuleItemNameSearchCriteria("foo_db", "foo_rule",
"foo_rule_item")).isPresent());
}
}
