(shardingsphere) branch master updated: Refactor DatabaseRuleMetaDataNodePath (#34589)

[zhangliang]

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 72676a5fc27 Refactor DatabaseRuleMetaDataNodePath (#34589)
72676a5fc27 is described below

commit 72676a5fc274adf270b23504f0d34951cb0753b0
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Feb 7 17:19:23 2025 +0800

    Refactor DatabaseRuleMetaDataNodePath (#34589)
---
 .../node/path/metadata/DatabaseRuleMetaDataNodePath.java     | 12 ++++++------
 .../node/path/metadata/DatabaseRuleMetaDataNodePathTest.java |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
 
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
index 29de28aef26..784e771ef31 100644
--- 
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
+++ 
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePath.java
@@ -57,11 +57,11 @@ public final class DatabaseRuleMetaDataNodePath {
      *
      * @param databaseName database name
      * @param ruleTypeName rule type name
-     * @param key key
+     * @param ruleItemName rule item name
      * @return database rule path without version
      */
-    public static String getRulePath(final String databaseName, final String 
ruleTypeName, final String key) {
-        return String.join("/", getRulePath(databaseName, ruleTypeName), key);
+    public static String getRulePath(final String databaseName, final String 
ruleTypeName, final String ruleItemName) {
+        return String.join("/", getRulePath(databaseName, ruleTypeName), 
ruleItemName);
     }
     
     /**
@@ -69,10 +69,10 @@ public final class DatabaseRuleMetaDataNodePath {
      *
      * @param databaseName database name
      * @param ruleTypeName rule type name
-     * @param key key
+     * @param ruleItemName rule item name
      * @return database rule version node path
      */
-    public static VersionNodePath getVersionNodePath(final String 
databaseName, final String ruleTypeName, final String key) {
-        return new VersionNodePath(getRulePath(databaseName, ruleTypeName, 
key));
+    public static VersionNodePath getVersionNodePath(final String 
databaseName, final String ruleTypeName, final String ruleItemName) {
+        return new VersionNodePath(getRulePath(databaseName, ruleTypeName, 
ruleItemName));
     }
 }
diff --git 
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
 
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
index d065326ca67..f2d2aefa922 100644
--- 
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
+++ 
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseRuleMetaDataNodePathTest.java
@@ -36,13 +36,13 @@ class DatabaseRuleMetaDataNodePathTest {
     
     @Test
     void assertGetRulePathWithKey() {
-        assertThat(DatabaseRuleMetaDataNodePath.getRulePath("foo_db", 
"foo_rule", "sharding"), is("/metadata/foo_db/rules/foo_rule/sharding"));
+        assertThat(DatabaseRuleMetaDataNodePath.getRulePath("foo_db", 
"foo_rule", "foo_rule_item"), 
is("/metadata/foo_db/rules/foo_rule/foo_rule_item"));
     }
     
     @Test
     void assertGetVersionNodePath() {
-        assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePath("foo_db", 
"sharding", "foo_key").getActiveVersionPath(), 
is("/metadata/foo_db/rules/sharding/foo_key/active_version"));
-        assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePath("foo_db", 
"sharding", "foo_key").getVersionsPath(), 
is("/metadata/foo_db/rules/sharding/foo_key/versions"));
-        assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePath("foo_db", 
"sharding", "foo_key").getVersionPath(0), 
is("/metadata/foo_db/rules/sharding/foo_key/versions/0"));
+        assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePath("foo_db", 
"sharding", "foo_rule_item").getActiveVersionPath(), 
is("/metadata/foo_db/rules/sharding/foo_rule_item/active_version"));
+        assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePath("foo_db", 
"sharding", "foo_rule_item").getVersionsPath(), 
is("/metadata/foo_db/rules/sharding/foo_rule_item/versions"));
+        assertThat(DatabaseRuleMetaDataNodePath.getVersionNodePath("foo_db", 
"sharding", "foo_rule_item").getVersionPath(0), 
is("/metadata/foo_db/rules/sharding/foo_rule_item/versions/0"));
     }
 }