Refactor NodePath (#34698)

terrymanu · web-flow · commit d55f2448dc00 · 2025-02-16T20:19:38.000+08:00
* Refactor NodePath

* Refactor NodePath
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePath.java
@@ -20,7 +20,7 @@
 import org.apache.shardingsphere.mode.node.path.NodePath;
 
 /**
- * Database node path generator.
+ * Database node path.
  */
 public final class DatabaseNodePath implements NodePath {
     
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePath.java
@@ -20,6 +20,7 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.NodePath;
 import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
 
 /**
@@ -32,8 +33,14 @@ public final class SchemaNodePath implements NodePath {
     
     private final String databaseName;
     
+    private final NodePathGenerator nodePathGenerator = new NodePathGenerator(new DatabaseNodePath());
+    
+    public SchemaNodePath() {
+        this(NodePathPattern.IDENTIFIER);
+    }
+    
     @Override
     public String getRootPath() {
-        return String.join("/", new NodePathGenerator(new DatabaseNodePath()).getPath(databaseName), SCHEMAS_NODE);
+        return String.join("/", nodePathGenerator.getPath(databaseName), SCHEMAS_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathParser.java
@@ -41,7 +41,7 @@ public final class SchemaNodePathParser {
      */
     public static Optional<String> findSchemaName(final String path, final boolean containsChildPath) {
         String endPattern = containsChildPath ? "?" : "$";
-        Pattern pattern = Pattern.compile(new NodePathGenerator(new SchemaNodePath(NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+        Pattern pattern = Pattern.compile(new NodePathGenerator(new SchemaNodePath()).getPath(NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(path);
         return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
     }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePath.java
@@ -19,6 +19,7 @@
 
 import org.apache.shardingsphere.mode.node.path.NodePath;
 import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 
 /**
  * Table node path.
@@ -27,17 +28,21 @@ public final class TableNodePath implements NodePath {
     
     private static final String TABLES_NODE = "tables";
     
-    private final SchemaNodePath schemaNodePath;
-    
     private final String schemaName;
     
+    private final NodePathGenerator nodePathGenerator;
+    
+    public TableNodePath() {
+        this(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
+    }
+    
     public TableNodePath(final String databaseName, final String schemaName) {
-        schemaNodePath = new SchemaNodePath(databaseName);
         this.schemaName = schemaName;
+        nodePathGenerator = new NodePathGenerator(new SchemaNodePath(databaseName));
     }
     
     @Override
     public String getRootPath() {
-        return String.join("/", new NodePathGenerator(schemaNodePath).getPath(schemaName), TABLES_NODE);
+        return String.join("/", nodePathGenerator.getPath(schemaName), TABLES_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathParser.java
@@ -33,11 +33,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class TableNodePathParser {
     
-    private static final Pattern PATTERN = Pattern.compile(
-            new NodePathGenerator(new TableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN = Pattern.compile(new NodePathGenerator(new TableNodePath()).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
     
-    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(
-            new NodePathGenerator(new TableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER));
+    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(new NodePathGenerator(new TableNodePath()).getPath(NodePathPattern.IDENTIFIER));
     
     /**
      * Find table name.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
@@ -19,6 +19,7 @@
 
 import org.apache.shardingsphere.mode.node.path.NodePath;
 import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 
 /**
  * View path.
@@ -27,17 +28,21 @@ public final class ViewNodePath implements NodePath {
     
     private static final String VIEWS_NODE = "views";
     
-    private final SchemaNodePath schemaNodePath;
-    
     private final String schemaName;
     
+    private final NodePathGenerator nodePathGenerator;
+    
+    public ViewNodePath() {
+        this(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER);
+    }
+    
     public ViewNodePath(final String databaseName, final String schemaName) {
-        schemaNodePath = new SchemaNodePath(databaseName);
         this.schemaName = schemaName;
+        nodePathGenerator = new NodePathGenerator(new SchemaNodePath(databaseName));
     }
     
     @Override
     public String getRootPath() {
-        return String.join("/", new NodePathGenerator(schemaNodePath).getPath(schemaName), VIEWS_NODE);
+        return String.join("/", nodePathGenerator.getPath(schemaName), VIEWS_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathParser.java
@@ -33,11 +33,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ViewNodePathParser {
     
-    private static final Pattern PATTERN = Pattern.compile(
-            new NodePathGenerator(new ViewNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN = Pattern.compile(new NodePathGenerator(new ViewNodePath()).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
     
-    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(
-            new NodePathGenerator(new ViewNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER));
+    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(new NodePathGenerator(new ViewNodePath()).getPath(NodePathPattern.IDENTIFIER));
     
     /**
      * Get view name.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePath.java
@@ -25,17 +25,17 @@
  */
 public final class DatabaseRuleItemNodePath implements NodePath {
     
-    private final DatabaseRuleNodePath databaseRuleNodePath;
-    
     private final String ruleType;
     
+    private final NodePathGenerator nodePathGenerator;
+    
     public DatabaseRuleItemNodePath(final String databaseName, final String ruleType) {
-        databaseRuleNodePath = new DatabaseRuleNodePath(databaseName);
         this.ruleType = ruleType;
+        nodePathGenerator = new NodePathGenerator(new DatabaseRuleNodePath(databaseName));
     }
     
     @Override
     public String getRootPath() {
-        return new NodePathGenerator(databaseRuleNodePath).getPath(ruleType);
+        return nodePathGenerator.getPath(ruleType);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePath.java
@@ -19,10 +19,11 @@
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
 
 /**
- * Database rule node path generator.
+ * Database rule node path.
  */
 @RequiredArgsConstructor
 public final class DatabaseRuleNodePath implements NodePath {
@@ -31,8 +32,10 @@ public final class DatabaseRuleNodePath implements NodePath {
     
     private final String databaseName;
     
+    private final NodePathGenerator nodePathGenerator = new NodePathGenerator(new DatabaseNodePath());
+    
     @Override
     public String getRootPath() {
-        return String.join("/", new DatabaseNodePath().getRootPath(), databaseName, RULE_NODE);
+        return String.join("/", nodePathGenerator.getPath(databaseName), RULE_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePath.java
@@ -19,6 +19,8 @@
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
 
 /**
@@ -31,8 +33,14 @@ public final class DataSourceNodePath implements NodePath {
     
     private final String databaseName;
     
+    private final NodePathGenerator nodePathGenerator = new NodePathGenerator(new DatabaseNodePath());
+    
+    public DataSourceNodePath() {
+        this(NodePathPattern.IDENTIFIER);
+    }
+    
     @Override
     public String getRootPath() {
-        return String.join("/", new DatabaseNodePath().getRootPath(), databaseName, DATA_SOURCES_NODE);
+        return String.join("/", nodePathGenerator.getPath(databaseName), DATA_SOURCES_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathParser.java
@@ -19,7 +19,6 @@
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 
 import java.util.regex.Pattern;
 
@@ -29,7 +28,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class DataSourceNodePathParser {
     
-    private static final Pattern PATTERN = Pattern.compile(new DataSourceNodePath(NodePathPattern.IDENTIFIER).getRootPath() + "?", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN = Pattern.compile(new DataSourceNodePath().getRootPath() + "?", Pattern.CASE_INSENSITIVE);
     
     /**
      * Is data source path.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePath.java
@@ -17,21 +17,29 @@
 
 package org.apache.shardingsphere.mode.node.path.metadata.storage;
 
-import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 
 /**
  * Storage node node path.
  */
-@RequiredArgsConstructor
 public final class StorageNodeNodePath implements NodePath {
     
     private static final String NODES_NODE = "nodes";
     
-    private final String databaseName;
+    private final NodePathGenerator nodePathGenerator;
+    
+    public StorageNodeNodePath() {
+        this(NodePathPattern.IDENTIFIER);
+    }
+    
+    public StorageNodeNodePath(final String databaseName) {
+        nodePathGenerator = new NodePathGenerator(new DataSourceNodePath(databaseName));
+    }
     
     @Override
     public String getRootPath() {
-        return String.join("/", new DataSourceNodePath(databaseName).getRootPath(), NODES_NODE);
+        return nodePathGenerator.getPath(NODES_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathParser.java
@@ -33,11 +33,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class StorageNodeNodePathParser {
     
-    private static final Pattern PATTERN = Pattern.compile(
-            new NodePathGenerator(new StorageNodeNodePath(NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN = Pattern.compile(new NodePathGenerator(new StorageNodeNodePath()).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
     
-    private static final VersionNodePathParser VERSION_PARSER =
-            new VersionNodePathParser(String.join("/", new StorageNodeNodePath(NodePathPattern.IDENTIFIER).getRootPath(), NodePathPattern.IDENTIFIER));
+    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(String.join("/", new StorageNodeNodePath().getRootPath(), NodePathPattern.IDENTIFIER));
     
     /**
      * Find storage node name.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePath.java
@@ -19,6 +19,8 @@
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 
 /**
  * Storage unit node path.
@@ -28,10 +30,18 @@ public final class StorageUnitNodePath implements NodePath {
     
     private static final String UNITS_NODE = "units";
     
-    private final String databaseName;
+    private final NodePathGenerator nodePathGenerator;
+    
+    public StorageUnitNodePath() {
+        this(NodePathPattern.IDENTIFIER);
+    }
+    
+    public StorageUnitNodePath(final String databaseName) {
+        nodePathGenerator = new NodePathGenerator(new DataSourceNodePath(databaseName));
+    }
     
     @Override
     public String getRootPath() {
-        return String.join("/", new DataSourceNodePath(databaseName).getRootPath(), UNITS_NODE);
+        return nodePathGenerator.getPath(UNITS_NODE);
     }
 }
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathParser.java
@@ -33,11 +33,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class StorageUnitNodePathParser {
     
-    private static final Pattern PATTERN = Pattern.compile(
-            new NodePathGenerator(new StorageUnitNodePath(NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN = Pattern.compile(new NodePathGenerator(new StorageUnitNodePath()).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
     
-    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(
-            String.join("/", new StorageUnitNodePath(NodePathPattern.IDENTIFIER).getRootPath(), NodePathPattern.IDENTIFIER));
+    private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(String.join("/", new StorageUnitNodePath().getRootPath(), NodePathPattern.IDENTIFIER));
     
     /**
      * Find storage unit name.
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathTest.java
@@ -28,5 +28,4 @@ class DatabaseRuleNodePathTest {
     void assertGetRootPath() {
         assertThat(new DatabaseRuleNodePath("foo_db").getRootPath(), is("/metadata/foo_db/rules"));
     }
-    
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public final class SchemaNodePathParser {`
`41`	`41`	`*/`
`42`	`42`	`public static Optional<String> findSchemaName(final String path, final boolean containsChildPath) {`
`43`	`43`	`String endPattern = containsChildPath ? "?" : "$";`
`44`		`- Pattern pattern = Pattern.compile(new NodePathGenerator(new SchemaNodePath(NodePathPattern.IDENTIFIER)).getPath(NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);`
	`44`	`+ Pattern pattern = Pattern.compile(new NodePathGenerator(new SchemaNodePath()).getPath(NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);`
`45`	`45`	`Matcher matcher = pattern.matcher(path);`
`46`	`46`	`return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,17 @@`
`25`	`25`	`*/`
`26`	`26`	`public final class DatabaseRuleItemNodePath implements NodePath {`
`27`	`27`
`28`		`- private final DatabaseRuleNodePath databaseRuleNodePath;`
`29`		`-`
`30`	`28`	`private final String ruleType;`
`31`	`29`
	`30`	`+ private final NodePathGenerator nodePathGenerator;`
	`31`	`+`
`32`	`32`	`public DatabaseRuleItemNodePath(final String databaseName, final String ruleType) {`
`33`		`- databaseRuleNodePath = new DatabaseRuleNodePath(databaseName);`
`34`	`33`	`this.ruleType = ruleType;`
	`34`	`+ nodePathGenerator = new NodePathGenerator(new DatabaseRuleNodePath(databaseName));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public String getRootPath() {`
`39`		`- return new NodePathGenerator(databaseRuleNodePath).getPath(ruleType);`
	`39`	`+ return nodePathGenerator.getPath(ruleType);`
`40`	`40`	`}`
`41`	`41`	`}`