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 09:19:00 UTC
(shardingsphere) branch master updated: Rename NodePathGenerator to NodePath (#34696)
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 7cfc879d4d1 Rename NodePathGenerator to NodePath (#34696)
7cfc879d4d1 is described below
commit 7cfc879d4d131886fd62dfb0bc409a4b83bd1398
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Feb 16 17:18:55 2025 +0800
Rename NodePathGenerator to NodePath (#34696)
* Rename NodePathGenerator to NodePath
* Rename NodePathGenerator to NodePath
---
.../config/database/DataSourceUnitPersistService.java | 10 +++++-----
.../config/database/DatabaseRulePersistService.java | 14 +++++++-------
.../persist/config/global/GlobalRulePersistService.java | 8 ++++----
.../persist/config/global/PropertiesPersistService.java | 8 ++++----
.../metadata/service/DatabaseMetaDataPersistService.java | 8 ++++----
.../metadata/service/SchemaMetaDataPersistService.java | 10 +++++-----
.../metadata/service/TableMetaDataPersistService.java | 10 +++++-----
.../metadata/service/ViewMetaDataPersistService.java | 10 +++++-----
.../shardingsphere/mode/manager/ContextManagerTest.java | 4 ++--
.../node/path/{NodePathGenerator.java => NodePath.java} | 2 +-
...{NodePathVersionGenerator.java => NodePathVersion.java} | 2 +-
...odePathGenerator.java => GlobalPropertiesNodePath.java} | 6 +++---
.../path/config/global/GlobalPropertiesNodePathParser.java | 2 +-
...lRuleNodePathGenerator.java => GlobalRuleNodePath.java} | 4 ++--
.../node/path/config/global/GlobalRuleNodePathParser.java | 2 +-
...atabaseNodePathGenerator.java => DatabaseNodePath.java} | 4 ++--
.../mode/node/path/metadata/DatabaseNodePathParser.java | 2 +-
.../{SchemaNodePathGenerator.java => SchemaNodePath.java} | 8 ++++----
.../node/path/metadata/database/SchemaNodePathParser.java | 2 +-
.../{TableNodePathGenerator.java => TableNodePath.java} | 10 +++++-----
.../node/path/metadata/database/TableNodePathParser.java | 4 ++--
.../{ViewNodePathGenerator.java => ViewNodePath.java} | 10 +++++-----
.../node/path/metadata/database/ViewNodePathParser.java | 4 ++--
...odePathGenerator.java => DatabaseRuleItemNodePath.java} | 10 +++++-----
...uleNodePathGenerator.java => DatabaseRuleNodePath.java} | 8 ++++----
...ourceNodePathGenerator.java => DataSourceNodePath.java} | 8 ++++----
.../path/metadata/storage/DataSourceNodePathParser.java | 2 +-
...NodeNodePathGenerator.java => StorageNodeNodePath.java} | 6 +++---
.../path/metadata/storage/StorageNodeNodePathParser.java | 4 ++--
...UnitNodePathGenerator.java => StorageUnitNodePath.java} | 6 +++---
.../path/metadata/storage/StorageUnitNodePathParser.java | 4 ++--
...eneratorTest.java => GlobalPropertiesNodePathTest.java} | 6 +++---
...ePathGeneratorTest.java => GlobalRuleNodePathTest.java} | 8 ++++----
...odePathGeneratorTest.java => DatabaseNodePathTest.java} | 6 +++---
...aNodePathGeneratorTest.java => SchemaNodePathTest.java} | 6 +++---
...ewNodePathGeneratorTest.java => TableNodePathTest.java} | 12 ++++++------
...bleNodePathGeneratorTest.java => ViewNodePathTest.java} | 12 ++++++------
...eneratorTest.java => DatabaseRuleItemNodePathTest.java} | 6 +++---
...athGeneratorTest.java => DatabaseRuleNodePathTest.java} | 6 +++---
...ePathGeneratorTest.java => DataSourceNodePathTest.java} | 4 ++--
...PathGeneratorTest.java => StorageNodeNodePathTest.java} | 8 ++++----
...PathGeneratorTest.java => StorageUnitNodePathTest.java} | 8 ++++----
...NodePathGeneratorTest.java => ComputeNodePathTest.java} | 2 +-
...NodePathGeneratorTest.java => ProcessNodePathTest.java} | 2 +-
...ratorTest.java => QualifiedDataSourceNodePathTest.java} | 2 +-
...PathGeneratorTest.java => ReservationNodePathTest.java} | 2 +-
...sNodePathGeneratorTest.java => StatesNodePathTest.java} | 2 +-
...ePathGeneratorTest.java => StatisticsNodePathTest.java} | 2 +-
...NodePathGeneratorTest.java => VersionNodePathTest.java} | 2 +-
.../global/type/DatabaseListenerChangedHandler.java | 6 +++---
.../handler/global/type/GlobalRuleChangedHandler.java | 4 ++--
.../handler/global/type/PropertiesChangedHandler.java | 4 ++--
.../listener/DataChangedEventListenerRegistry.java | 4 ++--
53 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
index 6bb9f77595a..76d8e10cf34 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePo
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.metadata.storage.StorageUnitNodePathGenerator;
+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;
@@ -55,7 +55,7 @@ public final class DataSourceUnitPersistService {
* @return data source pool properties map
*/
public Map<String, DataSourcePoolProperties> load(final String databaseName) {
- Collection<String> childrenKeys = repository.getChildrenKeys(new StorageUnitNodePathGenerator(databaseName).getRootPath());
+ Collection<String> childrenKeys = repository.getChildrenKeys(new StorageUnitNodePath(databaseName).getRootPath());
return childrenKeys.stream().collect(Collectors.toMap(each -> each, each -> load(databaseName, each), (a, b) -> b, () -> new LinkedHashMap<>(childrenKeys.size(), 1F)));
}
@@ -68,7 +68,7 @@ public final class DataSourceUnitPersistService {
*/
@SuppressWarnings("unchecked")
public DataSourcePoolProperties load(final String databaseName, final String dataSourceName) {
- VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePathGenerator(databaseName).getVersion(dataSourceName);
+ VersionNodePathGenerator versionNodePathGenerator = 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 +82,7 @@ public final class DataSourceUnitPersistService {
*/
public void persist(final String databaseName, final Map<String, DataSourcePoolProperties> dataSourcePropsMap) {
for (Entry<String, DataSourcePoolProperties> entry : dataSourcePropsMap.entrySet()) {
- VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePathGenerator(databaseName).getVersion(entry.getKey());
+ VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePath(databaseName).getVersion(entry.getKey());
metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
}
}
@@ -94,6 +94,6 @@ public final class DataSourceUnitPersistService {
* @param dataSourceName data source name
*/
public void delete(final String databaseName, final String dataSourceName) {
- repository.delete(new StorageUnitNodePathGenerator(databaseName).getPath(dataSourceName));
+ repository.delete(new StorageUnitNodePath(databaseName).getPath(dataSourceName));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index 82493a987a4..a933f8d45a0 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigur
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.config.database.item.DatabaseRuleItem;
-import org.apache.shardingsphere.mode.node.path.metadata.rule.DatabaseRuleItemNodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.metadata.rule.DatabaseRuleNodePathGenerator;
+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;
@@ -68,7 +68,7 @@ public final class DatabaseRulePersistService {
* @return configurations
*/
public Collection<RuleConfiguration> load(final String databaseName) {
- return yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(new DatabaseRuleNodePathGenerator(databaseName).getRootPath()));
+ return yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(new DatabaseRuleNodePath(databaseName).getRootPath()));
}
/**
@@ -93,9 +93,9 @@ public final class DatabaseRulePersistService {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RepositoryTuple each : repositoryTuples) {
DatabaseRuleItem databaseRuleItem = new DatabaseRuleItem(each.getKey());
- VersionNodePathGenerator versionNodePathGenerator = new DatabaseRuleItemNodePathGenerator(databaseName, ruleType).getVersion(databaseRuleItem);
+ VersionNodePathGenerator versionNodePathGenerator = new DatabaseRuleItemNodePath(databaseName, ruleType).getVersion(databaseRuleItem);
int nextVersion = metaDataVersionPersistService.persist(versionNodePathGenerator, each.getValue());
- result.add(new MetaDataVersion(new DatabaseRuleItemNodePathGenerator(databaseName, ruleType).getPath(databaseRuleItem), Math.max(MetaDataVersion.INIT_VERSION, nextVersion - 1)));
+ result.add(new MetaDataVersion(new DatabaseRuleItemNodePath(databaseName, ruleType).getPath(databaseRuleItem), Math.max(MetaDataVersion.INIT_VERSION, nextVersion - 1)));
}
return result;
}
@@ -107,7 +107,7 @@ public final class DatabaseRulePersistService {
* @param ruleType rule type
*/
public void delete(final String databaseName, final String ruleType) {
- repository.delete(new DatabaseRuleNodePathGenerator(databaseName).getPath(ruleType));
+ repository.delete(new DatabaseRuleNodePath(databaseName).getPath(ruleType));
}
/**
@@ -133,7 +133,7 @@ public final class DatabaseRulePersistService {
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 DatabaseRuleItemNodePathGenerator(databaseName, ruleType).getPath(new DatabaseRuleItem(each.getKey()));
+ String toBeDeletedKey = new DatabaseRuleItemNodePath(databaseName, ruleType).getPath(new DatabaseRuleItem(each.getKey()));
repository.delete(toBeDeletedKey);
result.add(new MetaDataVersion(toBeDeletedKey));
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index 9e74b6f5783..8d59802bd38 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfigurati
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.config.global.GlobalRuleNodePathGenerator;
+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;
import org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
@@ -57,7 +57,7 @@ public final class GlobalRulePersistService {
* @return global rule configurations
*/
public Collection<RuleConfiguration> load() {
- return yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(new GlobalRuleNodePathGenerator().getRootPath()));
+ return yamlRepositoryTupleSwapperEngine.swapToRuleConfigurations(repositoryTuplePersistService.load(new GlobalRuleNodePath().getRootPath()));
}
/**
@@ -67,7 +67,7 @@ public final class GlobalRulePersistService {
* @return global rule configuration
*/
public Optional<RuleConfiguration> load(final String ruleType) {
- return yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleType, repositoryTuplePersistService.load(new GlobalRuleNodePathGenerator().getPath(ruleType)));
+ return yamlRepositoryTupleSwapperEngine.swapToRuleConfiguration(ruleType, repositoryTuplePersistService.load(new GlobalRuleNodePath().getPath(ruleType)));
}
/**
@@ -83,7 +83,7 @@ public final class GlobalRulePersistService {
private void persistTuples(final Collection<RepositoryTuple> tuples) {
for (RepositoryTuple each : tuples) {
- VersionNodePathGenerator versionNodePathGenerator = new GlobalRuleNodePathGenerator().getVersion(each.getKey());
+ VersionNodePathGenerator versionNodePathGenerator = new GlobalRuleNodePath().getVersion(each.getKey());
metaDataVersionPersistService.persist(versionNodePathGenerator, each.getValue());
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
index 242bbdbe02a..cfa515c9546 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
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.config.global.GlobalPropertiesNodePathGenerator;
+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 +45,12 @@ public final class PropertiesPersistService {
*/
public Properties load() {
return loadActiveVersion()
- .map(optional -> YamlEngine.unmarshal(repository.query(new GlobalPropertiesNodePathGenerator().getVersion("").getVersionPath(optional)), Properties.class))
+ .map(optional -> YamlEngine.unmarshal(repository.query(new GlobalPropertiesNodePath().getVersion("").getVersionPath(optional)), Properties.class))
.orElse(new Properties());
}
private Optional<Integer> loadActiveVersion() {
- String value = repository.query(new GlobalPropertiesNodePathGenerator().getVersion("").getActiveVersionPath());
+ String value = repository.query(new GlobalPropertiesNodePath().getVersion("").getActiveVersionPath());
return Strings.isNullOrEmpty(value) ? Optional.empty() : Optional.of(Integer.parseInt(value));
}
@@ -60,7 +60,7 @@ public final class PropertiesPersistService {
* @param props properties
*/
public void persist(final Properties props) {
- VersionNodePathGenerator versionNodePathGenerator = new GlobalPropertiesNodePathGenerator().getVersion("");
+ VersionNodePathGenerator versionNodePathGenerator = new GlobalPropertiesNodePath().getVersion("");
metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(props));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
index a8610293c50..be03ee18c14 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -37,7 +37,7 @@ public final class DatabaseMetaDataPersistService {
* @param databaseName to be added database name
*/
public void add(final String databaseName) {
- repository.persist(new DatabaseNodePathGenerator().getPath(databaseName), "");
+ repository.persist(new DatabaseNodePath().getPath(databaseName), "");
}
/**
@@ -46,7 +46,7 @@ public final class DatabaseMetaDataPersistService {
* @param databaseName to be dropped database name
*/
public void drop(final String databaseName) {
- repository.delete(new DatabaseNodePathGenerator().getPath(databaseName));
+ repository.delete(new DatabaseNodePath().getPath(databaseName));
}
/**
@@ -55,6 +55,6 @@ public final class DatabaseMetaDataPersistService {
* @return loaded database names
*/
public Collection<String> loadAllDatabaseNames() {
- return repository.getChildrenKeys(new DatabaseNodePathGenerator().getRootPath());
+ return repository.getChildrenKeys(new DatabaseNodePath().getRootPath());
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
index 2cced9954aa..53233e6c499 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
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.metadata.database.SchemaNodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePathGenerator;
+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;
import java.util.Collection;
@@ -52,7 +52,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName to be added schema name
*/
public void add(final String databaseName, final String schemaName) {
- repository.persist(new TableNodePathGenerator(databaseName, schemaName).getRootPath(), "");
+ repository.persist(new TableNodePath(databaseName, schemaName).getRootPath(), "");
}
/**
@@ -62,7 +62,7 @@ public final class SchemaMetaDataPersistService {
* @param schemaName to be dropped schema name
*/
public void drop(final String databaseName, final String schemaName) {
- repository.delete(new SchemaNodePathGenerator(databaseName).getPath(schemaName));
+ repository.delete(new SchemaNodePath(databaseName).getPath(schemaName));
}
/**
@@ -112,7 +112,7 @@ public final class SchemaMetaDataPersistService {
* @return schemas
*/
public Collection<ShardingSphereSchema> load(final String databaseName) {
- return repository.getChildrenKeys(new SchemaNodePathGenerator(databaseName).getRootPath()).stream()
+ return repository.getChildrenKeys(new SchemaNodePath(databaseName).getRootPath()).stream()
.map(each -> new ShardingSphereSchema(each, tableMetaDataPersistService.load(databaseName, each), viewMetaDataPersistService.load(databaseName, each))).collect(Collectors.toList());
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
index b586e0d931e..8cf45b2e807 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
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.metadata.database.TableNodePathGenerator;
+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;
@@ -50,7 +50,7 @@ public final class TableMetaDataPersistService {
* @return loaded tables
*/
public Collection<ShardingSphereTable> load(final String databaseName, final String schemaName) {
- return repository.getChildrenKeys(new TableNodePathGenerator(databaseName, schemaName).getRootPath()).stream().map(each -> load(databaseName, schemaName, each))
+ return repository.getChildrenKeys(new TableNodePath(databaseName, schemaName).getRootPath()).stream().map(each -> load(databaseName, schemaName, each))
.collect(Collectors.toList());
}
@@ -63,7 +63,7 @@ public final class TableMetaDataPersistService {
* @return loaded table
*/
public ShardingSphereTable load(final String databaseName, final String schemaName, final String tableName) {
- VersionNodePathGenerator versionNodePathGenerator = new TableNodePathGenerator(databaseName, schemaName).getVersion(tableName);
+ VersionNodePathGenerator versionNodePathGenerator = 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 +79,7 @@ public final class TableMetaDataPersistService {
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 TableNodePathGenerator(databaseName, schemaName).getVersion(tableName);
+ VersionNodePathGenerator versionNodePathGenerator = new TableNodePath(databaseName, schemaName).getVersion(tableName);
metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
@@ -92,7 +92,7 @@ public final class TableMetaDataPersistService {
* @param tableName to be dropped table name
*/
public void drop(final String databaseName, final String schemaName, final String tableName) {
- repository.delete(new TableNodePathGenerator(databaseName, schemaName).getPath(tableName.toLowerCase()));
+ repository.delete(new TableNodePath(databaseName, schemaName).getPath(tableName.toLowerCase()));
}
/**
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
index 18da6638862..e61ea902e4f 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
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.metadata.database.ViewNodePathGenerator;
+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;
@@ -50,7 +50,7 @@ public final class ViewMetaDataPersistService {
* @return loaded views
*/
public Collection<ShardingSphereView> load(final String databaseName, final String schemaName) {
- return repository.getChildrenKeys(new ViewNodePathGenerator(databaseName, schemaName).getRootPath()).stream().map(each -> load(databaseName, schemaName, each))
+ return repository.getChildrenKeys(new ViewNodePath(databaseName, schemaName).getRootPath()).stream().map(each -> load(databaseName, schemaName, each))
.collect(Collectors.toList());
}
@@ -63,7 +63,7 @@ public final class ViewMetaDataPersistService {
* @return loaded view
*/
public ShardingSphereView load(final String databaseName, final String schemaName, final String viewName) {
- VersionNodePathGenerator versionNodePathGenerator = new ViewNodePathGenerator(databaseName, schemaName).getVersion(viewName);
+ VersionNodePathGenerator versionNodePathGenerator = 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 +79,7 @@ public final class ViewMetaDataPersistService {
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 ViewNodePathGenerator(databaseName, schemaName).getVersion(viewName);
+ VersionNodePathGenerator versionNodePathGenerator = new ViewNodePath(databaseName, schemaName).getVersion(viewName);
metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
@@ -92,6 +92,6 @@ public final class ViewMetaDataPersistService {
* @param viewName to be dropped view name
*/
public void drop(final String databaseName, final String schemaName, final String viewName) {
- repository.delete(new ViewNodePathGenerator(databaseName, schemaName).getPath(viewName.toLowerCase()));
+ repository.delete(new ViewNodePath(databaseName, schemaName).getPath(viewName.toLowerCase()));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 17ffbc8b738..d0390408ded 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
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.metadata.database.SchemaNodePathGenerator;
+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;
import org.junit.jupiter.api.BeforeEach;
@@ -146,7 +146,7 @@ class ContextManagerTest {
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 SchemaNodePathGenerator("foo_db").getPath("foo_schema"));
+ verify(contextManager.getPersistServiceFacade().getRepository()).delete(new SchemaNodePath("foo_db").getPath("foo_schema"));
}
@Test
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePath.java
similarity index 96%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePath.java
index 0c30f0a46bf..4d455d55ddb 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePath.java
@@ -22,7 +22,7 @@ package org.apache.shardingsphere.mode.node.path;
*
* @param <T> type of node
*/
-public interface NodePathGenerator<T> {
+public interface NodePath<T> {
/**
* Get root path.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathVersionGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathVersion.java
similarity index 94%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathVersionGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathVersion.java
index d5e38e2f7f1..9110d0716b4 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathVersionGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathVersion.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator
*
* @param <T> type of node
*/
-public interface NodePathVersionGenerator<T> extends NodePathGenerator<T> {
+public interface NodePathVersion<T> extends NodePath<T> {
/**
* Get table version node path generator.
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/GlobalPropertiesNodePath.java
similarity index 85%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePath.java
index dd805b48374..e3679f76591 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/GlobalPropertiesNodePath.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.mode.node.path.config.global;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* Global properties node path generator.
*/
-public final class GlobalPropertiesNodePathGenerator implements NodePathVersionGenerator<String> {
+public final class GlobalPropertiesNodePath implements NodePathVersion<String> {
private static final String ROOT_NODE = "/props";
@@ -39,6 +39,6 @@ public final class GlobalPropertiesNodePathGenerator implements NodePathVersionG
@Override
public VersionNodePathGenerator getVersion(final String node) {
- return new VersionNodePathGenerator(getPath(node));
+ return new VersionNodePathGenerator(getRootPath());
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathParser.java
index e8a9a54b774..a9cf3b38798 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathParser.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathParser.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class GlobalPropertiesNodePathParser {
- private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(new GlobalPropertiesNodePathGenerator().getRootPath());
+ private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(new GlobalPropertiesNodePath().getRootPath());
/**
* Get properties version node path parser.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
similarity index 89%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
index 1d0ef912344..7bf20bb5837 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.mode.node.path.config.global;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* Global props node path generator.
*/
-public final class GlobalRuleNodePathGenerator implements NodePathVersionGenerator<String> {
+public final class GlobalRuleNodePath implements NodePathVersion<String> {
private static final String ROOT_NODE = "/rules";
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathParser.java
index cc6260d842b..20c6dbf2230 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathParser.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathParser.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class GlobalRuleNodePathParser {
- private static final VersionNodePathParser PARSER = new VersionNodePathParser(new GlobalRuleNodePathGenerator().getRootPath() + "/" + NodePathPattern.IDENTIFIER);
+ private static final VersionNodePathParser PARSER = new VersionNodePathParser(new GlobalRuleNodePath().getRootPath() + "/" + NodePathPattern.IDENTIFIER);
/**
* Get global rule version node path parser.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePath.java
similarity index 88%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePath.java
index 8931a80635e..1d951e28503 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePath.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.mode.node.path.metadata;
-import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePath;
/**
* Database node path generator.
*/
-public final class DatabaseNodePathGenerator implements NodePathGenerator<String> {
+public final class DatabaseNodePath implements NodePath<String> {
private static final String ROOT_NODE = "/metadata";
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathParser.java
index f6183663c41..fd99685e027 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathParser.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathParser.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DatabaseNodePathParser {
- private static final Pattern DATABASE_PATTERN = Pattern.compile(new DatabaseNodePathGenerator().getPath(NodePathPattern.IDENTIFIER) + "?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern DATABASE_PATTERN = Pattern.compile(new DatabaseNodePath().getPath(NodePathPattern.IDENTIFIER) + "?", Pattern.CASE_INSENSITIVE);
/**
* Find database name.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePath.java
similarity index 83%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePath.java
index a898211f56f..5475a5bc26e 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePath.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.mode.node.path.metadata.database;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
/**
* Schema node path generator.
*/
@RequiredArgsConstructor
-public final class SchemaNodePathGenerator implements NodePathGenerator<String> {
+public final class SchemaNodePath implements NodePath<String> {
private static final String SCHEMAS_NODE = "schemas";
@@ -33,7 +33,7 @@ public final class SchemaNodePathGenerator implements NodePathGenerator<String>
@Override
public String getRootPath() {
- return String.join("/", new DatabaseNodePathGenerator().getPath(databaseName), SCHEMAS_NODE);
+ return String.join("/", new DatabaseNodePath().getPath(databaseName), SCHEMAS_NODE);
}
@Override
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
index ddff0544152..2c8a98dc2ac 100644
--- 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
@@ -40,7 +40,7 @@ public final class SchemaNodePathParser {
*/
public static Optional<String> findSchemaName(final String path, final boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern = Pattern.compile(new SchemaNodePathGenerator(NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(new SchemaNodePath(NodePathPattern.IDENTIFIER).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/TableNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePath.java
similarity index 80%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePath.java
index 28d43c78603..4a63de26637 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePath.java
@@ -17,22 +17,22 @@
package org.apache.shardingsphere.mode.node.path.metadata.database;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* Table node path generator.
*/
-public final class TableNodePathGenerator implements NodePathVersionGenerator<String> {
+public final class TableNodePath implements NodePathVersion<String> {
private static final String TABLES_NODE = "tables";
- private final SchemaNodePathGenerator schemaNodePathGenerator;
+ private final SchemaNodePath schemaNodePathGenerator;
private final String schemaName;
- public TableNodePathGenerator(final String databaseName, final String schemaName) {
- schemaNodePathGenerator = new SchemaNodePathGenerator(databaseName);
+ public TableNodePath(final String databaseName, final String schemaName) {
+ schemaNodePathGenerator = new SchemaNodePath(databaseName);
this.schemaName = schemaName;
}
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
index 071ee734f6a..1778eadf117 100644
--- 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,10 +33,10 @@ import java.util.regex.Pattern;
public final class TableNodePathParser {
private static final Pattern PATTERN = Pattern.compile(
- new TableNodePathGenerator(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ new TableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(
- new TableNodePathGenerator(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER));
+ new TableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER));
/**
* Find table name.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
similarity index 80%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
index 189c82610e9..487bab09974 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
@@ -17,22 +17,22 @@
package org.apache.shardingsphere.mode.node.path.metadata.database;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* View path generator.
*/
-public final class ViewNodePathGenerator implements NodePathVersionGenerator<String> {
+public final class ViewNodePath implements NodePathVersion<String> {
private static final String VIEWS_NODE = "views";
- private final SchemaNodePathGenerator schemaNodePathGenerator;
+ private final SchemaNodePath schemaNodePathGenerator;
private final String schemaName;
- public ViewNodePathGenerator(final String databaseName, final String schemaName) {
- schemaNodePathGenerator = new SchemaNodePathGenerator(databaseName);
+ public ViewNodePath(final String databaseName, final String schemaName) {
+ schemaNodePathGenerator = new SchemaNodePath(databaseName);
this.schemaName = schemaName;
}
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
index 7b370940bca..c8f4be3defd 100644
--- 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,10 +33,10 @@ import java.util.regex.Pattern;
public final class ViewNodePathParser {
private static final Pattern PATTERN = Pattern.compile(
- new ViewNodePathGenerator(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ new ViewNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(
- new ViewNodePathGenerator(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER));
+ new ViewNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER));
/**
* Get view name.
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePath.java
similarity index 81%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePath.java
index ede8227adca..94613cf5852 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePath.java
@@ -17,21 +17,21 @@
package org.apache.shardingsphere.mode.node.path.metadata.rule;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.config.database.item.DatabaseRuleItem;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* Database rule item node path generator.
*/
-public final class DatabaseRuleItemNodePathGenerator implements NodePathVersionGenerator<DatabaseRuleItem> {
+public final class DatabaseRuleItemNodePath implements NodePathVersion<DatabaseRuleItem> {
- private final DatabaseRuleNodePathGenerator databaseRuleNodePathGenerator;
+ private final DatabaseRuleNodePath databaseRuleNodePathGenerator;
private final String ruleType;
- public DatabaseRuleItemNodePathGenerator(final String databaseName, final String ruleType) {
- databaseRuleNodePathGenerator = new DatabaseRuleNodePathGenerator(databaseName);
+ public DatabaseRuleItemNodePath(final String databaseName, final String ruleType) {
+ databaseRuleNodePathGenerator = new DatabaseRuleNodePath(databaseName);
this.ruleType = ruleType;
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePath.java
similarity index 82%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePath.java
index 2c4a33a674a..7fc2e8b5f13 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePath.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.mode.node.path.metadata.rule;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
/**
* Database rule node path generator.
*/
@RequiredArgsConstructor
-public final class DatabaseRuleNodePathGenerator implements NodePathGenerator<String> {
+public final class DatabaseRuleNodePath implements NodePath<String> {
private static final String RULE_NODE = "rules";
@@ -33,7 +33,7 @@ public final class DatabaseRuleNodePathGenerator implements NodePathGenerator<St
@Override
public String getRootPath() {
- return String.join("/", new DatabaseNodePathGenerator().getRootPath(), databaseName, RULE_NODE);
+ return String.join("/", new DatabaseNodePath().getRootPath(), databaseName, RULE_NODE);
}
@Override
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/DataSourceNodePath.java
similarity index 82%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePath.java
index bb25f2ecc3e..44341b66ae4 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/DataSourceNodePath.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.mode.node.path.metadata.storage;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
/**
* Data source node path generator.
*/
@RequiredArgsConstructor
-public final class DataSourceNodePathGenerator implements NodePathGenerator<String> {
+public final class DataSourceNodePath implements NodePath<String> {
private static final String DATA_SOURCES_NODE = "data_sources";
@@ -33,7 +33,7 @@ public final class DataSourceNodePathGenerator implements NodePathGenerator<Stri
@Override
public String getRootPath() {
- return String.join("/", new DatabaseNodePathGenerator().getRootPath(), databaseName, DATA_SOURCES_NODE);
+ return String.join("/", new DatabaseNodePath().getRootPath(), databaseName, DATA_SOURCES_NODE);
}
@Override
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
index 69bbb869719..be21b5e7e1d 100644
--- 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
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataSourceNodePathParser {
- private static final Pattern PATTERN = Pattern.compile(new DataSourceNodePathGenerator(NodePathPattern.IDENTIFIER).getRootPath() + "?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern PATTERN = Pattern.compile(new DataSourceNodePath(NodePathPattern.IDENTIFIER).getRootPath() + "?", Pattern.CASE_INSENSITIVE);
/**
* Is data source path.
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/StorageNodeNodePath.java
similarity index 84%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePath.java
index 3428a9c568c..721a47b9561 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/StorageNodeNodePath.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.mode.node.path.metadata.storage;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* Storage node node path generator.
*/
@RequiredArgsConstructor
-public final class StorageNodeNodePathGenerator implements NodePathVersionGenerator<String> {
+public final class StorageNodeNodePath implements NodePathVersion<String> {
private static final String NODES_NODE = "nodes";
@@ -33,7 +33,7 @@ public final class StorageNodeNodePathGenerator implements NodePathVersionGenera
@Override
public String getRootPath() {
- return String.join("/", new DataSourceNodePathGenerator(databaseName).getRootPath(), NODES_NODE);
+ return String.join("/", new DataSourceNodePath(databaseName).getRootPath(), NODES_NODE);
}
@Override
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
index e51de92de3d..b58653a0618 100644
--- 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
@@ -32,10 +32,10 @@ import java.util.regex.Pattern;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class StorageNodeNodePathParser {
- private static final Pattern PATTERN = Pattern.compile(new StorageNodeNodePathGenerator(NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ private static final Pattern PATTERN = Pattern.compile(new StorageNodeNodePath(NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
private static final VersionNodePathParser VERSION_PARSER =
- new VersionNodePathParser(String.join("/", new StorageNodeNodePathGenerator(NodePathPattern.IDENTIFIER).getRootPath(), NodePathPattern.IDENTIFIER));
+ new VersionNodePathParser(String.join("/", new StorageNodeNodePath(NodePathPattern.IDENTIFIER).getRootPath(), NodePathPattern.IDENTIFIER));
/**
* Find storage node name.
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/StorageUnitNodePath.java
similarity index 84%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePath.java
index 15ea771f24f..574502bc2ea 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/StorageUnitNodePath.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.mode.node.path.metadata.storage;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.NodePathVersionGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathVersion;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
/**
* Storage unit node path generator.
*/
@RequiredArgsConstructor
-public final class StorageUnitNodePathGenerator implements NodePathVersionGenerator<String> {
+public final class StorageUnitNodePath implements NodePathVersion<String> {
private static final String UNITS_NODE = "units";
@@ -33,7 +33,7 @@ public final class StorageUnitNodePathGenerator implements NodePathVersionGenera
@Override
public String getRootPath() {
- return String.join("/", new DataSourceNodePathGenerator(databaseName).getRootPath(), UNITS_NODE);
+ return String.join("/", new DataSourceNodePath(databaseName).getRootPath(), UNITS_NODE);
}
@Override
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
index 6f62220050c..320ff8b9950 100644
--- 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,10 +33,10 @@ import java.util.regex.Pattern;
public final class StorageUnitNodePathParser {
private static final Pattern PATTERN = Pattern.compile(
- new StorageUnitNodePathGenerator(NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ new StorageUnitNodePath(NodePathPattern.IDENTIFIER).getPath(NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
private static final VersionNodePathParser VERSION_PARSER = new VersionNodePathParser(
- String.join("/", new StorageUnitNodePathGenerator(NodePathPattern.IDENTIFIER).getRootPath(), NodePathPattern.IDENTIFIER));
+ String.join("/", new StorageUnitNodePath(NodePathPattern.IDENTIFIER).getRootPath(), NodePathPattern.IDENTIFIER));
/**
* Find storage unit name.
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathTest.java
similarity index 89%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathTest.java
index 8fa725e2acf..2bcb7889b98 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalPropertiesNodePathTest.java
@@ -23,16 +23,16 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class GlobalPropertiesNodePathGeneratorTest {
+class GlobalPropertiesNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new GlobalPropertiesNodePathGenerator().getRootPath(), is("/props"));
+ assertThat(new GlobalPropertiesNodePath().getRootPath(), is("/props"));
}
@Test
void assertGetVersion() {
- VersionNodePathGenerator versionNodePathGenerator = new GlobalPropertiesNodePathGenerator().getVersion("");
+ VersionNodePathGenerator versionNodePathGenerator = new GlobalPropertiesNodePath().getVersion("");
assertThat(versionNodePathGenerator.getActiveVersionPath(), is("/props/active_version"));
assertThat(versionNodePathGenerator.getVersionsPath(), is("/props/versions"));
assertThat(versionNodePathGenerator.getVersionPath(0), is("/props/versions/0"));
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathTest.java
similarity index 85%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathTest.java
index f254a7a356d..7df261a3cf0 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePathTest.java
@@ -23,21 +23,21 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class GlobalRuleNodePathGeneratorTest {
+class GlobalRuleNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new GlobalRuleNodePathGenerator().getRootPath(), is("/rules"));
+ assertThat(new GlobalRuleNodePath().getRootPath(), is("/rules"));
}
@Test
void assertGetPath() {
- assertThat(new GlobalRuleNodePathGenerator().getPath("foo_rule"), is("/rules/foo_rule"));
+ assertThat(new GlobalRuleNodePath().getPath("foo_rule"), is("/rules/foo_rule"));
}
@Test
void assertGetVersion() {
- VersionNodePathGenerator versionNodePathGenerator = new GlobalRuleNodePathGenerator().getVersion("foo_rule");
+ VersionNodePathGenerator versionNodePathGenerator = new GlobalRuleNodePath().getVersion("foo_rule");
assertThat(versionNodePathGenerator.getActiveVersionPath(), is("/rules/foo_rule/active_version"));
assertThat(versionNodePathGenerator.getVersionsPath(), is("/rules/foo_rule/versions"));
assertThat(versionNodePathGenerator.getVersionPath(0), is("/rules/foo_rule/versions/0"));
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathTest.java
similarity index 83%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathTest.java
index 51036d3b67c..11d4edc3c88 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseNodePathTest.java
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DatabaseNodePathGeneratorTest {
+class DatabaseNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new DatabaseNodePathGenerator().getRootPath(), is("/metadata"));
+ assertThat(new DatabaseNodePath().getRootPath(), is("/metadata"));
}
@Test
void assertGetPath() {
- assertThat(new DatabaseNodePathGenerator().getPath("foo_db"), is("/metadata/foo_db"));
+ assertThat(new DatabaseNodePath().getPath("foo_db"), is("/metadata/foo_db"));
}
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathTest.java
similarity index 80%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathTest.java
index 053f455ef4d..dccb7a3c9e1 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/SchemaNodePathTest.java
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class SchemaNodePathGeneratorTest {
+class SchemaNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new SchemaNodePathGenerator("foo_db").getRootPath(), is("/metadata/foo_db/schemas"));
+ assertThat(new SchemaNodePath("foo_db").getRootPath(), is("/metadata/foo_db/schemas"));
}
@Test
void assertGetPath() {
- assertThat(new SchemaNodePathGenerator("foo_db").getPath("foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
+ assertThat(new SchemaNodePath("foo_db").getPath("foo_schema"), is("/metadata/foo_db/schemas/foo_schema"));
}
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathTest.java
similarity index 57%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathTest.java
index c40ced5d24c..264b6469a0b 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathTest.java
@@ -22,22 +22,22 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ViewNodePathGeneratorTest {
+class TableNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new ViewNodePathGenerator("foo_db", "foo_schema").getRootPath(), is("/metadata/foo_db/schemas/foo_schema/views"));
+ assertThat(new TableNodePath("foo_db", "foo_schema").getRootPath(), is("/metadata/foo_db/schemas/foo_schema/tables"));
}
@Test
void assertGetPath() {
- assertThat(new ViewNodePathGenerator("foo_db", "foo_schema").getPath("foo_view"), is("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
+ assertThat(new TableNodePath("foo_db", "foo_schema").getPath("foo_tbl"), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
}
@Test
void assertGetVersion() {
- assertThat(new ViewNodePathGenerator("foo_db", "foo_schema").getVersion("foo_view").getActiveVersionPath(), is("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version"));
- assertThat(new ViewNodePathGenerator("foo_db", "foo_schema").getVersion("foo_view").getVersionsPath(), is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions"));
- assertThat(new ViewNodePathGenerator("foo_db", "foo_schema").getVersion("foo_view").getVersionPath(0), is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/0"));
+ assertThat(new TableNodePath("foo_db", "foo_schema").getVersion("foo_tbl").getActiveVersionPath(), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
+ assertThat(new TableNodePath("foo_db", "foo_schema").getVersion("foo_tbl").getVersionsPath(), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
+ assertThat(new TableNodePath("foo_db", "foo_schema").getVersion("foo_tbl").getVersionPath(0), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0"));
}
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathTest.java
similarity index 57%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathTest.java
index 2242715e194..4dc5f8ce763 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/TableNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePathTest.java
@@ -22,22 +22,22 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class TableNodePathGeneratorTest {
+class ViewNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new TableNodePathGenerator("foo_db", "foo_schema").getRootPath(), is("/metadata/foo_db/schemas/foo_schema/tables"));
+ assertThat(new ViewNodePath("foo_db", "foo_schema").getRootPath(), is("/metadata/foo_db/schemas/foo_schema/views"));
}
@Test
void assertGetPath() {
- assertThat(new TableNodePathGenerator("foo_db", "foo_schema").getPath("foo_tbl"), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl"));
+ assertThat(new ViewNodePath("foo_db", "foo_schema").getPath("foo_view"), is("/metadata/foo_db/schemas/foo_schema/views/foo_view"));
}
@Test
void assertGetVersion() {
- assertThat(new TableNodePathGenerator("foo_db", "foo_schema").getVersion("foo_tbl").getActiveVersionPath(), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"));
- assertThat(new TableNodePathGenerator("foo_db", "foo_schema").getVersion("foo_tbl").getVersionsPath(), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions"));
- assertThat(new TableNodePathGenerator("foo_db", "foo_schema").getVersion("foo_tbl").getVersionPath(0), is("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/0"));
+ assertThat(new ViewNodePath("foo_db", "foo_schema").getVersion("foo_view").getActiveVersionPath(), is("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version"));
+ assertThat(new ViewNodePath("foo_db", "foo_schema").getVersion("foo_view").getVersionsPath(), is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions"));
+ assertThat(new ViewNodePath("foo_db", "foo_schema").getVersion("foo_view").getVersionPath(0), is("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/0"));
}
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathTest.java
similarity index 85%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathTest.java
index ebf9c219ec1..d5de317a0ef 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleItemNodePathTest.java
@@ -24,17 +24,17 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DatabaseRuleItemNodePathGeneratorTest {
+class DatabaseRuleItemNodePathTest {
@Test
void assertGetPath() {
- assertThat(new DatabaseRuleItemNodePathGenerator("foo_db", "foo_rule").getPath(new DatabaseRuleItem("foo_rule_item")), is("/metadata/foo_db/rules/foo_rule/foo_rule_item"));
+ assertThat(new DatabaseRuleItemNodePath("foo_db", "foo_rule").getPath(new DatabaseRuleItem("foo_rule_item")), is("/metadata/foo_db/rules/foo_rule/foo_rule_item"));
}
@Test
void assertGetVersion() {
DatabaseRuleItem databaseRuleItem = new DatabaseRuleItem("foo_rule_item");
- VersionNodePathGenerator versionNodePathGenerator = new DatabaseRuleItemNodePathGenerator("foo_db", "foo_rule").getVersion(databaseRuleItem);
+ VersionNodePathGenerator versionNodePathGenerator = new DatabaseRuleItemNodePath("foo_db", "foo_rule").getVersion(databaseRuleItem);
assertThat(versionNodePathGenerator.getActiveVersionPath(), is("/metadata/foo_db/rules/foo_rule/foo_rule_item/active_version"));
assertThat(versionNodePathGenerator.getVersionsPath(), is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions"));
assertThat(versionNodePathGenerator.getVersionPath(0), is("/metadata/foo_db/rules/foo_rule/foo_rule_item/versions/0"));
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathTest.java
similarity index 80%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathTest.java
index 3963b47e05d..35e0aec3ae6 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/rule/DatabaseRuleNodePathTest.java
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DatabaseRuleNodePathGeneratorTest {
+class DatabaseRuleNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new DatabaseRuleNodePathGenerator("foo_db").getRootPath(), is("/metadata/foo_db/rules"));
+ assertThat(new DatabaseRuleNodePath("foo_db").getRootPath(), is("/metadata/foo_db/rules"));
}
@Test
void assertGetPath() {
- assertThat(new DatabaseRuleNodePathGenerator("foo_db").getPath("foo_rule"), is("/metadata/foo_db/rules/foo_rule"));
+ assertThat(new DatabaseRuleNodePath("foo_db").getPath("foo_rule"), is("/metadata/foo_db/rules/foo_rule"));
}
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathTest.java
similarity index 87%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathTest.java
index 2c4e1152840..ae906ee5442 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/DataSourceNodePathTest.java
@@ -22,10 +22,10 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DataSourceNodePathGeneratorTest {
+class DataSourceNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new DataSourceNodePathGenerator("foo_db").getRootPath(), is("/metadata/foo_db/data_sources"));
+ assertThat(new DataSourceNodePath("foo_db").getRootPath(), is("/metadata/foo_db/data_sources"));
}
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathTest.java
similarity index 82%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathTest.java
index 3963b8da8de..e2ca840d6d6 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageNodeNodePathTest.java
@@ -23,21 +23,21 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class StorageNodeNodePathGeneratorTest {
+class StorageNodeNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new StorageNodeNodePathGenerator("foo_db").getRootPath(), is("/metadata/foo_db/data_sources/nodes"));
+ assertThat(new StorageNodeNodePath("foo_db").getRootPath(), is("/metadata/foo_db/data_sources/nodes"));
}
@Test
void assertGetPath() {
- assertThat(new StorageNodeNodePathGenerator("foo_db").getPath("foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds"));
+ assertThat(new StorageNodeNodePath("foo_db").getPath("foo_ds"), is("/metadata/foo_db/data_sources/nodes/foo_ds"));
}
@Test
void assertGetVersion() {
- VersionNodePathGenerator versionNodePathGenerator = new StorageNodeNodePathGenerator("foo_db").getVersion("foo_ds");
+ VersionNodePathGenerator versionNodePathGenerator = new StorageNodeNodePath("foo_db").getVersion("foo_ds");
assertThat(versionNodePathGenerator.getActiveVersionPath(), is("/metadata/foo_db/data_sources/nodes/foo_ds/active_version"));
assertThat(versionNodePathGenerator.getVersionsPath(), is("/metadata/foo_db/data_sources/nodes/foo_ds/versions"));
assertThat(versionNodePathGenerator.getVersionPath(0), is("/metadata/foo_db/data_sources/nodes/foo_ds/versions/0"));
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathTest.java
similarity index 82%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathTest.java
index 2ee7197bde8..6a7caa92198 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/StorageUnitNodePathTest.java
@@ -23,21 +23,21 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class StorageUnitNodePathGeneratorTest {
+class StorageUnitNodePathTest {
@Test
void assertGetRootPath() {
- assertThat(new StorageUnitNodePathGenerator("foo_db").getRootPath(), is("/metadata/foo_db/data_sources/units"));
+ assertThat(new StorageUnitNodePath("foo_db").getRootPath(), is("/metadata/foo_db/data_sources/units"));
}
@Test
void assertGetPath() {
- assertThat(new StorageUnitNodePathGenerator("foo_db").getPath("foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds"));
+ assertThat(new StorageUnitNodePath("foo_db").getPath("foo_ds"), is("/metadata/foo_db/data_sources/units/foo_ds"));
}
@Test
void assertGetVersion() {
- VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePathGenerator("foo_db").getVersion("foo_ds");
+ VersionNodePathGenerator versionNodePathGenerator = new StorageUnitNodePath("foo_db").getVersion("foo_ds");
assertThat(versionNodePathGenerator.getActiveVersionPath(), is("/metadata/foo_db/data_sources/units/foo_ds/active_version"));
assertThat(versionNodePathGenerator.getVersionsPath(), is("/metadata/foo_db/data_sources/units/foo_ds/versions"));
assertThat(versionNodePathGenerator.getVersionPath(0), is("/metadata/foo_db/data_sources/units/foo_ds/versions/0"));
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathTest.java
similarity index 99%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathTest.java
index a54683174a0..3a01619cc5e 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ComputeNodePathGeneratorTest {
+class ComputeNodePathTest {
@Test
void assertGetRootPath() {
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathTest.java
similarity index 97%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathTest.java
index cf608e8779c..a1dd7546577 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ProcessNodePathGeneratorTest {
+class ProcessNodePathTest {
@Test
void assertGetRootPath() {
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathTest.java
similarity index 97%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathTest.java
index 877624582eb..7695504ee0d 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class QualifiedDataSourceNodePathGeneratorTest {
+class QualifiedDataSourceNodePathTest {
@Test
void assertGetRootPath() {
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathTest.java
similarity index 96%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathTest.java
index 5f771a9f40f..1b8dc04efee 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
-class ReservationNodePathGeneratorTest {
+class ReservationNodePathTest {
@Test
void assertGetWorkerIdReservationPath() {
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
similarity index 97%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
index 1abd6a35ab4..1824fd89a0d 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class StatesNodePathGeneratorTest {
+class StatesNodePathTest {
@Test
void assertGetClusterStatePath() {
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/statistics/StatisticsNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/statistics/StatisticsNodePathTest.java
similarity index 98%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/statistics/StatisticsNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/statistics/StatisticsNodePathTest.java
index 82359501afa..d83e8eff095 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/statistics/StatisticsNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/statistics/StatisticsNodePathTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class StatisticsNodePathGeneratorTest {
+class StatisticsNodePathTest {
@Test
void assertGetDatabasesRootPath() {
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
similarity index 98%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGeneratorTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
index 751b3a60f2e..8890cf50f44 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGeneratorTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
@@ -24,7 +24,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class VersionNodePathGeneratorTest {
+class VersionNodePathTest {
@Test
void assertGetActiveVersionPath() {
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
index 67ee6441fb1..7ecdf2308a4 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.Dat
import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
import org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
import org.apache.shardingsphere.mode.node.path.state.StatesNodePathGenerator;
import org.apache.shardingsphere.mode.node.path.state.StatesNodePathParser;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -57,10 +57,10 @@ public final class DatabaseListenerChangedHandler implements GlobalDataChangedEv
private static void handle(final ContextManager contextManager, final String databaseName, final ClusterDatabaseListenerCoordinatorType clusterDatabaseListenerCoordinatorType) {
ClusterPersistRepository repository = (ClusterPersistRepository) contextManager.getPersistServiceFacade().getRepository();
if (ClusterDatabaseListenerCoordinatorType.CREATE == clusterDatabaseListenerCoordinatorType) {
- repository.watch(new DatabaseNodePathGenerator().getPath(databaseName), new DatabaseMetaDataChangedListener(contextManager));
+ repository.watch(new DatabaseNodePath().getPath(databaseName), new DatabaseMetaDataChangedListener(contextManager));
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().addDatabase(databaseName);
} else if (ClusterDatabaseListenerCoordinatorType.DROP == clusterDatabaseListenerCoordinatorType) {
- repository.removeDataListener(new DatabaseNodePathGenerator().getPath(databaseName));
+ repository.removeDataListener(new DatabaseNodePath().getPath(databaseName));
contextManager.getMetaDataContextManager().getDatabaseMetaDataManager().dropDatabase(databaseName);
}
new ClusterDatabaseListenerPersistCoordinator(repository).delete(databaseName);
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java
index e6be5a2ef8d..fac2c75b3b0 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandler.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.checker.ActiveVersionChecker;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
-import org.apache.shardingsphere.mode.node.path.config.global.GlobalRuleNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.config.global.GlobalRuleNodePath;
import org.apache.shardingsphere.mode.node.path.config.global.GlobalRuleNodePathParser;
import java.util.Arrays;
@@ -38,7 +38,7 @@ public final class GlobalRuleChangedHandler implements GlobalDataChangedEventHan
@Override
public String getSubscribedKey() {
- return new GlobalRuleNodePathGenerator().getRootPath();
+ return new GlobalRuleNodePath().getRootPath();
}
@Override
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java
index c9d2d6f02b6..91834146afe 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/PropertiesChangedHandler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.checker.ActiveVersionChecker;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
-import org.apache.shardingsphere.mode.node.path.config.global.GlobalPropertiesNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.config.global.GlobalPropertiesNodePath;
import org.apache.shardingsphere.mode.node.path.config.global.GlobalPropertiesNodePathParser;
import java.util.Arrays;
@@ -35,7 +35,7 @@ public final class PropertiesChangedHandler implements GlobalDataChangedEventHan
@Override
public String getSubscribedKey() {
- return new GlobalPropertiesNodePathGenerator().getRootPath();
+ return new GlobalPropertiesNodePath().getRootPath();
}
@Override
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
index 43f13abc724..562ba8437e8 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.DatabaseMetaDataChangedListener;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.GlobalMetaDataChangedListener;
-import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.metadata.DatabaseNodePath;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import java.util.Collection;
@@ -53,7 +53,7 @@ public final class DataChangedEventListenerRegistry {
}
private void registerDatabaseListeners(final String databaseName) {
- repository.watch(new DatabaseNodePathGenerator().getPath(databaseName), new DatabaseMetaDataChangedListener(contextManager));
+ repository.watch(new DatabaseNodePath().getPath(databaseName), new DatabaseMetaDataChangedListener(contextManager));
}
private void registerGlobalHandlers(final GlobalDataChangedEventHandler handler) {