Add NodePathGenerator (#34697)

* Rename NodePathGenerator to NodePath

* Rename NodePathGenerator to NodePath

* Add NodePathGenerator

* Add NodePathGenerator

* Add NodePathGenerator

* Add NodePathGenerator

* Add NodePathGenerator

Author: terrymanu

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java

@@ -21,6 +21,7 @@
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.storage.StorageUnitNodePath;
 import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -68,7 +69,7 @@ public Map<String, DataSourcePoolProperties> load(final String databaseName) {
      */
     @SuppressWarnings("unchecked")
     public DataSourcePoolProperties load(final String databaseName, final String dataSourceName) {
-        VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePath(databaseName).getVersion(dataSourceName);
+        VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new StorageUnitNodePath(databaseName)).getVersion(dataSourceName);
         int activeVersion = Integer.parseInt(repository.query(versionNodePathGenerator.getActiveVersionPath()));
         String dataSourceContent = repository.query(versionNodePathGenerator.getVersionPath(activeVersion));
         return yamlDataSourceConfigurationSwapper.swapToDataSourcePoolProperties(YamlEngine.unmarshal(dataSourceContent, Map.class));
@@ -82,7 +83,7 @@ public DataSourcePoolProperties load(final String databaseName, final String dat
      */
     public void persist(final String databaseName, final Map<String, DataSourcePoolProperties> dataSourcePropsMap) {
         for (Entry<String, DataSourcePoolProperties> entry : dataSourcePropsMap.entrySet()) {
-            VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePath(databaseName).getVersion(entry.getKey());
+            VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new StorageUnitNodePath(databaseName)).getVersion(entry.getKey());
             metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
         }
     }
@@ -94,6 +95,6 @@ public void persist(final String databaseName, final Map<String, DataSourcePoolP
      * @param dataSourceName data source name
      */
     public void delete(final String databaseName, final String dataSourceName) {
-        repository.delete(new StorageUnitNodePath(databaseName).getPath(dataSourceName));
+        repository.delete(new NodePathGenerator(new StorageUnitNodePath(databaseName)).getPath(dataSourceName));
     }
 }

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java

@@ -23,10 +23,10 @@
 import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
 import org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.config.database.item.DatabaseRuleItem;
 import org.apache.shardingsphere.mode.node.path.metadata.rule.DatabaseRuleItemNodePath;
 import org.apache.shardingsphere.mode.node.path.metadata.rule.DatabaseRuleNodePath;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
 import org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
 import org.apache.shardingsphere.mode.node.tuple.annotation.RepositoryTupleEntity;
@@ -91,11 +91,11 @@ public Collection<MetaDataVersion> persist(final String databaseName, final Coll
 
     private Collection<MetaDataVersion> persistDataNodes(final String databaseName, final String ruleType, final Collection<RepositoryTuple> repositoryTuples) {
         Collection<MetaDataVersion> result = new LinkedList<>();
+        NodePathGenerator nodePathGenerator = new NodePathGenerator(new DatabaseRuleItemNodePath(databaseName, ruleType));
         for (RepositoryTuple each : repositoryTuples) {
             DatabaseRuleItem databaseRuleItem = new DatabaseRuleItem(each.getKey());
-            VersionNodePathGenerator versionNodePathGenerator = new DatabaseRuleItemNodePath(databaseName, ruleType).getVersion(databaseRuleItem);
-            int nextVersion = metaDataVersionPersistService.persist(versionNodePathGenerator, each.getValue());
-            result.add(new MetaDataVersion(new DatabaseRuleItemNodePath(databaseName, ruleType).getPath(databaseRuleItem), Math.max(MetaDataVersion.INIT_VERSION, nextVersion - 1)));
+            int nextVersion = metaDataVersionPersistService.persist(nodePathGenerator.getVersion(databaseRuleItem), each.getValue());
+            result.add(new MetaDataVersion(nodePathGenerator.getPath(databaseRuleItem), Math.max(MetaDataVersion.INIT_VERSION, nextVersion - 1)));
         }
         return result;
     }
@@ -107,7 +107,7 @@ private Collection<MetaDataVersion> persistDataNodes(final String databaseName,
      * @param ruleType rule type
      */
     public void delete(final String databaseName, final String ruleType) {
-        repository.delete(new DatabaseRuleNodePath(databaseName).getPath(ruleType));
+        repository.delete(new NodePathGenerator(new DatabaseRuleNodePath(databaseName)).getPath(ruleType));
     }
 
     /**
@@ -133,7 +133,7 @@ public Collection<MetaDataVersion> delete(final String databaseName, final Colle
     private Collection<MetaDataVersion> delete(final String databaseName, final String ruleType, final Collection<RepositoryTuple> repositoryTuples) {
         Collection<MetaDataVersion> result = new LinkedList<>();
         for (RepositoryTuple each : repositoryTuples) {
-            String toBeDeletedKey = new DatabaseRuleItemNodePath(databaseName, ruleType).getPath(new DatabaseRuleItem(each.getKey()));
+            String toBeDeletedKey = new NodePathGenerator(new DatabaseRuleItemNodePath(databaseName, ruleType)).getPath(new DatabaseRuleItem(each.getKey()));
             repository.delete(toBeDeletedKey);
             result.add(new MetaDataVersion(toBeDeletedKey));
         }

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java

@@ -22,6 +22,7 @@
 import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
 import org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.config.global.GlobalRuleNodePath;
 import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
@@ -67,7 +68,7 @@ public Collection<RuleConfiguration> load() {
      * @return global rule configuration
      */
     public Optional<RuleConfiguration> load(final String ruleType) {
-        return yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleType, repositoryTuplePersistService.load(new GlobalRuleNodePath().getPath(ruleType)));
+        return yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleType, repositoryTuplePersistService.load(new NodePathGenerator(new GlobalRuleNodePath()).getPath(ruleType)));
     }
 
     /**
@@ -83,7 +84,7 @@ public void persist(final Collection<RuleConfiguration> globalRuleConfigs) {
 
     private void persistTuples(final Collection<RepositoryTuple> tuples) {
         for (RepositoryTuple each : tuples) {
-            VersionNodePathGenerator versionNodePathGenerator = new GlobalRuleNodePath().getVersion(each.getKey());
+            VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new GlobalRuleNodePath()).getVersion(each.getKey());
             metaDataVersionPersistService.persist(versionNodePathGenerator, each.getValue());
         }
     }

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java

@@ -21,6 +21,7 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.config.global.GlobalPropertiesNodePath;
 import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -45,12 +46,12 @@ public final class PropertiesPersistService {
      */
     public Properties load() {
         return loadActiveVersion()
-                .map(optional -> YamlEngine.unmarshal(repository.query(new GlobalPropertiesNodePath().getVersion("").getVersionPath(optional)), Properties.class))
+                .map(optional -> YamlEngine.unmarshal(repository.query(new NodePathGenerator(new GlobalPropertiesNodePath()).getVersion(null).getVersionPath(optional)), Properties.class))
                 .orElse(new Properties());
     }
 
     private Optional<Integer> loadActiveVersion() {
-        String value = repository.query(new GlobalPropertiesNodePath().getVersion("").getActiveVersionPath());
+        String value = repository.query(new NodePathGenerator(new GlobalPropertiesNodePath()).getVersion(null).getActiveVersionPath());
         return Strings.isNullOrEmpty(value) ? Optional.empty() : Optional.of(Integer.parseInt(value));
     }
 
@@ -60,7 +61,7 @@ private Optional<Integer> loadActiveVersion() {
      * @param props properties
      */
     public void persist(final Properties props) {
-        VersionNodePathGenerator versionNodePathGenerator = new GlobalPropertiesNodePath().getVersion("");
+        VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new GlobalPropertiesNodePath()).getVersion(null);
         metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(props));
     }
 }

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java

@@ -18,6 +18,7 @@
 package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
 
 import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
@@ -37,7 +38,7 @@ public final class DatabaseMetaDataPersistService {
      * @param databaseName to be added database name
      */
     public void add(final String databaseName) {
-        repository.persist(new DatabaseNodePath().getPath(databaseName), "");
+        repository.persist(new NodePathGenerator(new DatabaseNodePath()).getPath(databaseName), "");
     }
 
     /**
@@ -46,7 +47,7 @@ public void add(final String databaseName) {
      * @param databaseName to be dropped database name
      */
     public void drop(final String databaseName) {
-        repository.delete(new DatabaseNodePath().getPath(databaseName));
+        repository.delete(new NodePathGenerator(new DatabaseNodePath()).getPath(databaseName));
     }
 
     /**

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java

@@ -20,6 +20,7 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.database.SchemaNodePath;
 import org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePath;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -62,7 +63,7 @@ public void add(final String databaseName, final String schemaName) {
      * @param schemaName to be dropped schema name
      */
     public void drop(final String databaseName, final String schemaName) {
-        repository.delete(new SchemaNodePath(databaseName).getPath(schemaName));
+        repository.delete(new NodePathGenerator(new SchemaNodePath(databaseName)).getPath(schemaName));
     }
 
     /**

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java

@@ -23,6 +23,7 @@
 import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
 import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePath;
 import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -63,7 +64,7 @@ public Collection<ShardingSphereTable> load(final String databaseName, final Str
      * @return loaded table
      */
     public ShardingSphereTable load(final String databaseName, final String schemaName, final String tableName) {
-        VersionNodePathGenerator versionNodePathGenerator = new TableNodePath(databaseName, schemaName).getVersion(tableName);
+        VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new TableNodePath(databaseName, schemaName)).getVersion(tableName);
         int activeVersion = Integer.parseInt(repository.query(versionNodePathGenerator.getActiveVersionPath()));
         String tableContent = repository.query(versionNodePathGenerator.getVersionPath(activeVersion));
         return swapper.swapToObject(YamlEngine.unmarshal(tableContent, YamlShardingSphereTable.class));
@@ -79,7 +80,7 @@ public ShardingSphereTable load(final String databaseName, final String schemaNa
     public void persist(final String databaseName, final String schemaName, final Collection<ShardingSphereTable> tables) {
         for (ShardingSphereTable each : tables) {
             String tableName = each.getName().toLowerCase();
-            VersionNodePathGenerator versionNodePathGenerator = new TableNodePath(databaseName, schemaName).getVersion(tableName);
+            VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new TableNodePath(databaseName, schemaName)).getVersion(tableName);
             metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
         }
     }
@@ -92,7 +93,7 @@ public void persist(final String databaseName, final String schemaName, final Co
      * @param tableName to be dropped table name
      */
     public void drop(final String databaseName, final String schemaName, final String tableName) {
-        repository.delete(new TableNodePath(databaseName, schemaName).getPath(tableName.toLowerCase()));
+        repository.delete(new NodePathGenerator(new TableNodePath(databaseName, schemaName)).getPath(tableName.toLowerCase()));
     }
 
     /**

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java

@@ -23,6 +23,7 @@
 import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
 import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
 import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.database.ViewNodePath;
 import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -63,7 +64,7 @@ public Collection<ShardingSphereView> load(final String databaseName, final Stri
      * @return loaded view
      */
     public ShardingSphereView load(final String databaseName, final String schemaName, final String viewName) {
-        VersionNodePathGenerator versionNodePathGenerator = new ViewNodePath(databaseName, schemaName).getVersion(viewName);
+        VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getVersion(viewName);
         int activeVersion = Integer.parseInt(repository.query(versionNodePathGenerator.getActiveVersionPath()));
         String view = repository.query(versionNodePathGenerator.getVersionPath(activeVersion));
         return swapper.swapToObject(YamlEngine.unmarshal(view, YamlShardingSphereView.class));
@@ -79,7 +80,7 @@ public ShardingSphereView load(final String databaseName, final String schemaNam
     public void persist(final String databaseName, final String schemaName, final Collection<ShardingSphereView> views) {
         for (ShardingSphereView each : views) {
             String viewName = each.getName().toLowerCase();
-            VersionNodePathGenerator versionNodePathGenerator = new ViewNodePath(databaseName, schemaName).getVersion(viewName);
+            VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getVersion(viewName);
             metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
         }
     }
@@ -92,6 +93,6 @@ public void persist(final String databaseName, final String schemaName, final Co
      * @param viewName to be dropped view name
      */
     public void drop(final String databaseName, final String schemaName, final String viewName) {
-        repository.delete(new ViewNodePath(databaseName, schemaName).getPath(viewName.toLowerCase()));
+        repository.delete(new NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getPath(viewName.toLowerCase()));
     }
 }

mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java

@@ -38,6 +38,7 @@
 import org.apache.shardingsphere.infra.rule.attribute.datanode.MutableDataNodeRuleAttribute;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
 import org.apache.shardingsphere.mode.node.path.metadata.database.SchemaNodePath;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
@@ -146,7 +147,7 @@ void assertReloadSchema() throws SQLException {
         when(metaDataContexts.getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
         ShardingSphereDatabase database = mockDatabase();
         contextManager.reloadSchema(database, "foo_schema", "foo_ds");
-        verify(contextManager.getPersistServiceFacade().getRepository()).delete(new SchemaNodePath("foo_db").getPath("foo_schema"));
+        verify(contextManager.getPersistServiceFacade().getRepository()).delete(new NodePathGenerator(new SchemaNodePath("foo_db")).getPath("foo_schema"));
     }
 
     @Test

mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePath.java

@@ -18,24 +18,14 @@
 package org.apache.shardingsphere.mode.node.path;
 
 /**
- * Node path generator.
- * 
- * @param <T> type of node
+ * Node path.
  */
-public interface NodePath<T> {
+public interface NodePath {
 
     /**
      * Get root path.
      *
      * @return root path
      */
     String getRootPath();
-    
-    /**
-     * Get path.
-     *
-     * @param node node
-     * @return path
-     */
-    String getPath(T node);
 }