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 12:28:23 UTC
(shardingsphere) branch master updated: Revise javadoc of ViewNodePath (#34699)
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 04398829177 Revise javadoc of ViewNodePath (#34699)
04398829177 is described below
commit 04398829177785b8778941cf8286649f084d9fc8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Feb 16 20:28:17 2025 +0800
Revise javadoc of ViewNodePath (#34699)
* Revise javadoc of ViewNodePath
* Rename VersionNodePathGenerator to VersionNodePath
---
.../config/RepositoryTuplePersistService.java | 6 +++---
.../database/DataSourceUnitPersistService.java | 12 ++++++------
.../config/global/GlobalRulePersistService.java | 6 +++---
.../config/global/PropertiesPersistService.java | 6 +++---
.../service/TableMetaDataPersistService.java | 12 ++++++------
.../service/ViewMetaDataPersistService.java | 12 ++++++------
.../version/MetaDataVersionPersistService.java | 22 +++++++++++-----------
.../version/MetaDataVersionPersistServiceTest.java | 6 +++---
.../mode/node/path/NodePathGenerator.java | 10 +++++-----
.../node/path/metadata/database/ViewNodePath.java | 2 +-
...NodePathGenerator.java => VersionNodePath.java} | 4 ++--
.../node/path/version/VersionNodePathParser.java | 2 +-
.../node/path/version/VersionNodePathTest.java | 12 ++++++------
.../rule/RuleConfigurationChangedHandler.java | 4 ++--
14 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java
index 088bbef7ac4..388bbd5b6dd 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/RepositoryTuplePersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.metadata.persist.config;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -42,7 +42,7 @@ public final class RepositoryTuplePersistService {
* @return loaded repository tuples
*/
public Collection<RepositoryTuple> load(final String rootNode) {
- return loadNodes(rootNode).stream().filter(VersionNodePathGenerator::isActiveVersionPath).map(this::createRepositoryTuple).collect(Collectors.toList());
+ return loadNodes(rootNode).stream().filter(VersionNodePath::isActiveVersionPath).map(this::createRepositoryTuple).collect(Collectors.toList());
}
private Collection<String> loadNodes(final String rootNode) {
@@ -59,7 +59,7 @@ public final class RepositoryTuplePersistService {
}
private RepositoryTuple createRepositoryTuple(final String activeVersionPath) {
- String activeVersionKey = VersionNodePathGenerator.getVersionPath(activeVersionPath, Integer.parseInt(repository.query(activeVersionPath)));
+ String activeVersionKey = VersionNodePath.getVersionPath(activeVersionPath, Integer.parseInt(repository.query(activeVersionPath)));
return new RepositoryTuple(activeVersionKey, repository.query(activeVersionKey));
}
}
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 293cb17c547..baf05b83dcc 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
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSour
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
import org.apache.shardingsphere.mode.node.path.metadata.storage.StorageUnitNodePath;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -69,9 +69,9 @@ public final class DataSourceUnitPersistService {
*/
@SuppressWarnings("unchecked")
public DataSourcePoolProperties load(final String databaseName, final String dataSourceName) {
- VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new StorageUnitNodePath(databaseName)).getVersion(dataSourceName);
- int activeVersion = Integer.parseInt(repository.query(versionNodePathGenerator.getActiveVersionPath()));
- String dataSourceContent = repository.query(versionNodePathGenerator.getVersionPath(activeVersion));
+ VersionNodePath versionNodePath = new NodePathGenerator(new StorageUnitNodePath(databaseName)).getVersion(dataSourceName);
+ int activeVersion = Integer.parseInt(repository.query(versionNodePath.getActiveVersionPath()));
+ String dataSourceContent = repository.query(versionNodePath.getVersionPath(activeVersion));
return yamlDataSourceConfigurationSwapper.swapToDataSourcePoolProperties(YamlEngine.unmarshal(dataSourceContent, Map.class));
}
@@ -83,8 +83,8 @@ 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 NodePathGenerator(new StorageUnitNodePath(databaseName)).getVersion(entry.getKey());
- metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
+ VersionNodePath versionNodePath = new NodePathGenerator(new StorageUnitNodePath(databaseName)).getVersion(entry.getKey());
+ metaDataVersionPersistService.persist(versionNodePath, YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
}
}
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 f4184a980c1..777ab502542 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
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePer
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
import org.apache.shardingsphere.mode.node.path.config.global.GlobalRuleNodePath;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -84,8 +84,8 @@ public final class GlobalRulePersistService {
private void persistTuples(final Collection<RepositoryTuple> tuples) {
for (RepositoryTuple each : tuples) {
- VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new GlobalRuleNodePath()).getVersion(each.getKey());
- metaDataVersionPersistService.persist(versionNodePathGenerator, each.getValue());
+ VersionNodePath versionNodePath = new NodePathGenerator(new GlobalRuleNodePath()).getVersion(each.getKey());
+ metaDataVersionPersistService.persist(versionNodePath, 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 bbf486c4194..c3f80382768 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
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
import org.apache.shardingsphere.mode.node.path.config.global.GlobalPropertiesNodePath;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Optional;
@@ -61,7 +61,7 @@ public final class PropertiesPersistService {
* @param props properties
*/
public void persist(final Properties props) {
- VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new GlobalPropertiesNodePath()).getVersion(null);
- metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(props));
+ VersionNodePath versionNodePath = new NodePathGenerator(new GlobalPropertiesNodePath()).getVersion(null);
+ metaDataVersionPersistService.persist(versionNodePath, YamlEngine.marshal(props));
}
}
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 31d1a23f606..641be9af945 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
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
import org.apache.shardingsphere.mode.node.path.metadata.database.TableNodePath;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -64,9 +64,9 @@ public final class TableMetaDataPersistService {
* @return loaded table
*/
public ShardingSphereTable load(final String databaseName, final String schemaName, final String tableName) {
- VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new TableNodePath(databaseName, schemaName)).getVersion(tableName);
- int activeVersion = Integer.parseInt(repository.query(versionNodePathGenerator.getActiveVersionPath()));
- String tableContent = repository.query(versionNodePathGenerator.getVersionPath(activeVersion));
+ VersionNodePath versionNodePath = new NodePathGenerator(new TableNodePath(databaseName, schemaName)).getVersion(tableName);
+ int activeVersion = Integer.parseInt(repository.query(versionNodePath.getActiveVersionPath()));
+ String tableContent = repository.query(versionNodePath.getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(tableContent, YamlShardingSphereTable.class));
}
@@ -80,8 +80,8 @@ 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 NodePathGenerator(new TableNodePath(databaseName, schemaName)).getVersion(tableName);
- metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
+ VersionNodePath versionNodePath = new NodePathGenerator(new TableNodePath(databaseName, schemaName)).getVersion(tableName);
+ metaDataVersionPersistService.persist(versionNodePath, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
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 4183bd8466f..9c253e07f9f 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
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
import org.apache.shardingsphere.mode.node.path.metadata.database.ViewNodePath;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
@@ -64,9 +64,9 @@ public final class ViewMetaDataPersistService {
* @return loaded view
*/
public ShardingSphereView load(final String databaseName, final String schemaName, final String viewName) {
- VersionNodePathGenerator versionNodePathGenerator = new NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getVersion(viewName);
- int activeVersion = Integer.parseInt(repository.query(versionNodePathGenerator.getActiveVersionPath()));
- String view = repository.query(versionNodePathGenerator.getVersionPath(activeVersion));
+ VersionNodePath versionNodePath = new NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getVersion(viewName);
+ int activeVersion = Integer.parseInt(repository.query(versionNodePath.getActiveVersionPath()));
+ String view = repository.query(versionNodePath.getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(view, YamlShardingSphereView.class));
}
@@ -80,8 +80,8 @@ 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 NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getVersion(viewName);
- metaDataVersionPersistService.persist(versionNodePathGenerator, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
+ VersionNodePath versionNodePath = new NodePathGenerator(new ViewNodePath(databaseName, schemaName)).getVersion(viewName);
+ metaDataVersionPersistService.persist(versionNodePath, YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
index 03e7a482d9c..6cce38baf3d 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.metadata.persist.version;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collections;
@@ -39,22 +39,22 @@ public final class MetaDataVersionPersistService {
/**
* Persist meta data.
*
- * @param versionNodePathGenerator version node path generator
+ * @param versionNodePath version node path generator
* @param content to be persisted content
* @return persisted meta data version
*/
- public int persist(final VersionNodePathGenerator versionNodePathGenerator, final String content) {
- int nextVersion = getNextVersion(versionNodePathGenerator.getVersionsPath());
- repository.persist(versionNodePathGenerator.getVersionPath(nextVersion), content);
- switchActiveVersion(versionNodePathGenerator, nextVersion);
+ public int persist(final VersionNodePath versionNodePath, final String content) {
+ int nextVersion = getNextVersion(versionNodePath.getVersionsPath());
+ repository.persist(versionNodePath.getVersionPath(nextVersion), content);
+ switchActiveVersion(versionNodePath, nextVersion);
return nextVersion;
}
- private void switchActiveVersion(final VersionNodePathGenerator versionNodePathGenerator, final int currentVersion) {
- repository.persist(versionNodePathGenerator.getActiveVersionPath(), String.valueOf(currentVersion));
+ private void switchActiveVersion(final VersionNodePath versionNodePath, final int currentVersion) {
+ repository.persist(versionNodePath.getActiveVersionPath(), String.valueOf(currentVersion));
if (MetaDataVersion.INIT_VERSION != currentVersion) {
- getVersions(versionNodePathGenerator.getVersionsPath()).stream().filter(version -> version < currentVersion)
- .forEach(version -> repository.delete(versionNodePathGenerator.getVersionPath(version)));
+ getVersions(versionNodePath.getVersionsPath()).stream().filter(version -> version < currentVersion)
+ .forEach(version -> repository.delete(versionNodePath.getVersionPath(version)));
}
}
@@ -86,6 +86,6 @@ public final class MetaDataVersionPersistService {
* @return loaded content
*/
public String loadContent(final String activeVersionPath, final int activeVersion) {
- return repository.query(VersionNodePathGenerator.getVersionPath(activeVersionPath, activeVersion));
+ return repository.query(VersionNodePath.getVersionPath(activeVersionPath, activeVersion));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistServiceTest.java
index c451f5335ac..5b7d6aa1608 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.metadata.persist.version;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -49,7 +49,7 @@ class MetaDataVersionPersistServiceTest {
@Test
void assertPersistWithNewMetaData() {
- assertThat(persistService.persist(new VersionNodePathGenerator("foo_db"), "foo_metadata"), is(0));
+ assertThat(persistService.persist(new VersionNodePath("foo_db"), "foo_metadata"), is(0));
verify(repository).persist("foo_db/versions/0", "foo_metadata");
verify(repository).persist("foo_db/active_version", "0");
verify(repository, times(0)).delete(any());
@@ -58,7 +58,7 @@ class MetaDataVersionPersistServiceTest {
@Test
void assertPersistWithExistedMetaData() {
when(repository.getChildrenKeys("foo_db/versions")).thenReturn(Arrays.asList("2", "1", "0"));
- assertThat(persistService.persist(new VersionNodePathGenerator("foo_db"), "foo_metadata"), is(3));
+ assertThat(persistService.persist(new VersionNodePath("foo_db"), "foo_metadata"), is(3));
verify(repository).persist("foo_db/versions/3", "foo_metadata");
verify(repository).persist("foo_db/active_version", "3");
verify(repository).delete("foo_db/versions/0");
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/NodePathGenerator.java
index 11d15d497a7..d02aa7727a0 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/NodePathGenerator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.node.path;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
/**
* Node path generator.
@@ -39,12 +39,12 @@ public final class NodePathGenerator {
}
/**
- * Get version node path generator.
+ * Get version node path.
*
* @param leafNode leaf node
- * @return version node path generator
+ * @return version node path
*/
- public VersionNodePathGenerator getVersion(final Object leafNode) {
- return new VersionNodePathGenerator(getPath(leafNode));
+ public VersionNodePath getVersion(final Object leafNode) {
+ return new VersionNodePath(getPath(leafNode));
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
index 9a6a939c7d0..042dab465c9 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/database/ViewNodePath.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
import org.apache.shardingsphere.mode.node.path.NodePathPattern;
/**
- * View path.
+ * View node path.
*/
public final class ViewNodePath implements NodePath {
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePath.java
similarity index 96%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGenerator.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePath.java
index 9752704501f..ac30484fe78 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathGenerator.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePath.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.mode.node.path.version;
import lombok.RequiredArgsConstructor;
/**
- * Version node path generator.
+ * Version node path.
*/
@RequiredArgsConstructor
-public final class VersionNodePathGenerator {
+public final class VersionNodePath {
private static final String ACTIVE_VERSION = "active_version";
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParser.java
index 76ec6ca9f8d..3c40af16983 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParser.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParser.java
@@ -33,7 +33,7 @@ public final class VersionNodePathParser {
private final Pattern versionPattern;
public VersionNodePathParser(final String regex) {
- VersionNodePathGenerator generator = new VersionNodePathGenerator(regex);
+ VersionNodePath generator = new VersionNodePath(regex);
activeVersionPattern = Pattern.compile(generator.getActiveVersionPath() + "$", Pattern.CASE_INSENSITIVE);
versionPattern = Pattern.compile(String.join("/", generator.getVersionsPath(), VERSION_PATTERN) + "$", Pattern.CASE_INSENSITIVE);
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
index 8890cf50f44..3dcef22fe14 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
@@ -28,27 +28,27 @@ class VersionNodePathTest {
@Test
void assertGetActiveVersionPath() {
- assertThat(new VersionNodePathGenerator("foo").getActiveVersionPath(), is("foo/active_version"));
+ assertThat(new VersionNodePath("foo").getActiveVersionPath(), is("foo/active_version"));
}
@Test
void assertGetVersionsPath() {
- assertThat(new VersionNodePathGenerator("foo").getVersionsPath(), is("foo/versions"));
+ assertThat(new VersionNodePath("foo").getVersionsPath(), is("foo/versions"));
}
@Test
void assertGetVersionPath() {
- assertThat(new VersionNodePathGenerator("foo").getVersionPath(0), is("foo/versions/0"));
+ assertThat(new VersionNodePath("foo").getVersionPath(0), is("foo/versions/0"));
}
@Test
void assertGetVersionPathFromActiveVersion() {
- assertThat(VersionNodePathGenerator.getVersionPath("foo_rule/active_version", 1), is("foo_rule/versions/1"));
+ assertThat(VersionNodePath.getVersionPath("foo_rule/active_version", 1), is("foo_rule/versions/1"));
}
@Test
void assertIsActiveVersionPath() {
- assertTrue(VersionNodePathGenerator.isActiveVersionPath("foo/active_version"));
- assertFalse(VersionNodePathGenerator.isActiveVersionPath("foo/versions"));
+ assertTrue(VersionNodePath.isActiveVersionPath("foo/active_version"));
+ assertFalse(VersionNodePath.isActiveVersionPath("foo/versions"));
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
index b493f4db279..a5daa8ecebb 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.changed.RuleItemChangedBuilder;
import org.apache.shardingsphere.mode.metadata.changed.executor.type.RuleItemAlteredBuildExecutor;
import org.apache.shardingsphere.mode.metadata.changed.executor.type.RuleItemDroppedBuildExecutor;
-import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropRuleItem;
@@ -57,7 +57,7 @@ public final class RuleConfigurationChangedHandler {
return;
}
if (Type.ADDED == event.getType() || Type.UPDATED == event.getType()) {
- if (!VersionNodePathGenerator.isActiveVersionPath(event.getKey())) {
+ if (!VersionNodePath.isActiveVersionPath(event.getKey())) {
return;
}
int version = Integer.parseInt(event.getValue());