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 2025/02/16 06:56:53 UTC
(shardingsphere) branch master updated: Refactor NodePathGenerator (#34695)
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 e0f139113b3 Refactor NodePathGenerator (#34695)
e0f139113b3 is described below
commit e0f139113b36227a2c57d2b7bbf4b036d43eaca3
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Feb 16 14:56:47 2025 +0800
Refactor NodePathGenerator (#34695)
---
.../node/path/config/global/GlobalPropertiesNodePathGenerator.java | 4 ++--
.../node/path/metadata/storage/DataSourceNodePathGenerator.java | 2 +-
.../node/path/metadata/storage/StorageNodeNodePathGenerator.java | 2 +-
.../node/path/metadata/storage/StorageUnitNodePathGenerator.java | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGenerator.java
index 721245d8b07..dd805b48374 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGenerator.java
@@ -34,11 +34,11 @@ public final class GlobalPropertiesNodePathGenerator implements NodePathVersionG
@Override
public String getPath(final String node) {
- throw new UnsupportedOperationException("Global properties node do not need path.");
+ return String.join("/", getRootPath(), node);
}
@Override
public VersionNodePathGenerator getVersion(final String node) {
- return new VersionNodePathGenerator(getRootPath());
+ return new VersionNodePathGenerator(getPath(node));
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
index 63581827234..bb25f2ecc3e 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
@@ -38,6 +38,6 @@ public final class DataSourceNodePathGenerator implements NodePathGenerator<Stri
@Override
public String getPath(final String node) {
- throw new UnsupportedOperationException("Data source node do not need path.");
+ return String.join("/", getRootPath(), node);
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGenerator.java
index 2f63018182a..3428a9c568c 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGenerator.java
@@ -43,6 +43,6 @@ public final class StorageNodeNodePathGenerator implements NodePathVersionGenera
@Override
public VersionNodePathGenerator getVersion(final String node) {
- return new VersionNodePathGenerator(String.join("/", getRootPath(), node));
+ return new VersionNodePathGenerator(getPath(node));
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGenerator.java
index ad34dabd0bb..15ea771f24f 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGenerator.java
@@ -37,12 +37,12 @@ public final class StorageUnitNodePathGenerator implements NodePathVersionGenera
}
@Override
- public String getPath(final String storageUnitName) {
- return String.join("/", getRootPath(), storageUnitName);
+ public String getPath(final String node) {
+ return String.join("/", getRootPath(), node);
}
@Override
public VersionNodePathGenerator getVersion(final String node) {
- return new VersionNodePathGenerator(String.join("/", getRootPath(), node));
+ return new VersionNodePathGenerator(getPath(node));
}
}