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 492c37d9c2c Rename UniqueDatabaseRuleItemNodePath and
NamedDatabaseRuleItemNodePath (#34658)
492c37d9c2c is described below
commit 492c37d9c2c22fbe93ef5afb97388eeb6b912af7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 13 15:04:07 2025 +0800
Rename UniqueDatabaseRuleItemNodePath and NamedDatabaseRuleItemNodePath
(#34658)
---
.../type/RuleItemAlteredBuildExecutor.java | 8 +++----
.../type/RuleItemDroppedBuildExecutor.java | 8 +++----
.../path/config/database/DatabaseRuleNodePath.java | 26 +++++++++++-----------
...ath.java => NamedDatabaseRuleItemNodePath.java} | 6 ++---
...th.java => UniqueDatabaseRuleItemNodePath.java} | 8 +++----
.../path/config/database/RuleNodePathTest.java | 10 ++++-----
...java => NamedDatabaseRuleItemNodePathTest.java} | 4 ++--
...ava => UniqueDatabaseRuleItemNodePathTest.java} | 10 ++++-----
8 files changed, 40 insertions(+), 40 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
index a89b49ecd4c..7cd49f2881e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.mode.metadata.changed.executor.type;
import
org.apache.shardingsphere.mode.metadata.changed.executor.RuleItemChangedBuildExecutor;
import
org.apache.shardingsphere.mode.node.path.config.database.DatabaseRuleNodePath;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedRuleItemNodePath;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedDatabaseRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueDatabaseRuleItemNodePath;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterNamedRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.alter.AlterUniqueRuleItem;
@@ -35,13 +35,13 @@ public final class RuleItemAlteredBuildExecutor implements
RuleItemChangedBuildE
@Override
public Optional<AlterRuleItem> build(final DatabaseRuleNodePath
databaseRuleNodePath, final String databaseName, final String path, final
Integer currentActiveVersion) {
- for (Entry<String, NamedRuleItemNodePath> entry :
databaseRuleNodePath.getNamedItems().entrySet()) {
+ for (Entry<String, NamedDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName =
entry.getValue().getVersionNodePathParser().findIdentifierByActiveVersionPath(path,
1);
if (itemName.isPresent()) {
return Optional.of(new AlterNamedRuleItem(databaseName,
itemName.get(), path, currentActiveVersion,
databaseRuleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
}
}
- for (Entry<String, UniqueRuleItemNodePath> entry :
databaseRuleNodePath.getUniqueItems().entrySet()) {
+ for (Entry<String, UniqueDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getUniqueItems().entrySet()) {
if
(entry.getValue().getVersionNodePathParser().isActiveVersionPath(path)) {
return Optional.of(new AlterUniqueRuleItem(databaseName, path,
currentActiveVersion, databaseRuleNodePath.getRoot().getRuleType() + "." +
entry.getKey()));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
index 5a99b218f2c..2d18b445233 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemDroppedBuildExecutor.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.mode.metadata.changed.executor.type;
import
org.apache.shardingsphere.mode.metadata.changed.executor.RuleItemChangedBuildExecutor;
import
org.apache.shardingsphere.mode.node.path.config.database.DatabaseRuleNodePath;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedRuleItemNodePath;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedDatabaseRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueDatabaseRuleItemNodePath;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropNamedRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropRuleItem;
import org.apache.shardingsphere.mode.spi.rule.item.drop.DropUniqueRuleItem;
@@ -35,13 +35,13 @@ public final class RuleItemDroppedBuildExecutor implements
RuleItemChangedBuildE
@Override
public Optional<DropRuleItem> build(final DatabaseRuleNodePath
databaseRuleNodePath, final String databaseName, final String path, final
Integer currentActiveVersion) {
- for (Entry<String, NamedRuleItemNodePath> entry :
databaseRuleNodePath.getNamedItems().entrySet()) {
+ for (Entry<String, NamedDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getNamedItems().entrySet()) {
Optional<String> itemName =
entry.getValue().findNameByItemPath(path);
if (itemName.isPresent()) {
return Optional.of(new DropNamedRuleItem(databaseName,
itemName.get(), databaseRuleNodePath.getRoot().getRuleType() + "." +
entry.getKey()));
}
}
- for (Entry<String, UniqueRuleItemNodePath> entry :
databaseRuleNodePath.getUniqueItems().entrySet()) {
+ for (Entry<String, UniqueDatabaseRuleItemNodePath> entry :
databaseRuleNodePath.getUniqueItems().entrySet()) {
if
(entry.getValue().getVersionNodePathParser().isActiveVersionPath(path)) {
return Optional.of(new DropUniqueRuleItem(databaseName,
databaseRuleNodePath.getRoot().getRuleType() + "." + entry.getKey()));
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/DatabaseRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/DatabaseRuleNodePath.java
index d2f3b92f4df..3102be1cef6 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/DatabaseRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/DatabaseRuleNodePath.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mode.node.path.config.database;
import lombok.Getter;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedRuleItemNodePath;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedDatabaseRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueDatabaseRuleItemNodePath;
import
org.apache.shardingsphere.mode.node.path.config.database.root.DatabaseRuleRootNodePath;
import java.util.Collection;
@@ -34,9 +34,9 @@ public final class DatabaseRuleNodePath {
private final DatabaseRuleRootNodePath root;
- private final Map<String, NamedRuleItemNodePath> namedItems;
+ private final Map<String, NamedDatabaseRuleItemNodePath> namedItems;
- private final Map<String, UniqueRuleItemNodePath> uniqueItems;
+ private final Map<String, UniqueDatabaseRuleItemNodePath> uniqueItems;
public DatabaseRuleNodePath(final String ruleType, final
Collection<String> namedRuleItemNodePathTypes, final Collection<String>
uniqueRuleItemNodePathTypes) {
root = new DatabaseRuleRootNodePath(ruleType);
@@ -44,22 +44,22 @@ public final class DatabaseRuleNodePath {
uniqueItems =
getUniqueRuleItemNodePathMap(uniqueRuleItemNodePathTypes);
}
- private Map<String, NamedRuleItemNodePath>
getNamedRuleItemNodePathMap(final Collection<String>
namedRuleItemNodePathTypes) {
- Map<String, NamedRuleItemNodePath> result = new
HashMap<>(namedRuleItemNodePathTypes.size(), 1F);
+ private Map<String, NamedDatabaseRuleItemNodePath>
getNamedRuleItemNodePathMap(final Collection<String>
namedRuleItemNodePathTypes) {
+ Map<String, NamedDatabaseRuleItemNodePath> result = new
HashMap<>(namedRuleItemNodePathTypes.size(), 1F);
for (String each : namedRuleItemNodePathTypes) {
- result.put(each, new NamedRuleItemNodePath(root, each));
+ result.put(each, new NamedDatabaseRuleItemNodePath(root, each));
}
return result;
}
- private Map<String, UniqueRuleItemNodePath>
getUniqueRuleItemNodePathMap(final Collection<String>
uniqueRuleItemNodePathTypes) {
- Map<String, UniqueRuleItemNodePath> result = new
HashMap<>(uniqueRuleItemNodePathTypes.size(), 1F);
+ private Map<String, UniqueDatabaseRuleItemNodePath>
getUniqueRuleItemNodePathMap(final Collection<String>
uniqueRuleItemNodePathTypes) {
+ Map<String, UniqueDatabaseRuleItemNodePath> result = new
HashMap<>(uniqueRuleItemNodePathTypes.size(), 1F);
for (String each : uniqueRuleItemNodePathTypes) {
if (each.contains(".")) {
String[] values = each.split("\\.");
- result.put(values[1], new UniqueRuleItemNodePath(root,
values[0], values[1]));
+ result.put(values[1], new UniqueDatabaseRuleItemNodePath(root,
values[0], values[1]));
} else {
- result.put(each, new UniqueRuleItemNodePath(root, each));
+ result.put(each, new UniqueDatabaseRuleItemNodePath(root,
each));
}
}
return result;
@@ -71,7 +71,7 @@ public final class DatabaseRuleNodePath {
* @param itemType item type
* @return named rule item node path
*/
- public NamedRuleItemNodePath getNamedItem(final String itemType) {
+ public NamedDatabaseRuleItemNodePath getNamedItem(final String itemType) {
return namedItems.get(itemType);
}
@@ -81,7 +81,7 @@ public final class DatabaseRuleNodePath {
* @param itemType item type
* @return unique rule item node path
*/
- public UniqueRuleItemNodePath getUniqueItem(final String itemType) {
+ public UniqueDatabaseRuleItemNodePath getUniqueItem(final String itemType)
{
return uniqueItems.get(itemType);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
similarity index 91%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
index e469c543fa0..04cb0229a2d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
@@ -27,9 +27,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Named rule item node path.
+ * Named database rule item node path.
*/
-public final class NamedRuleItemNodePath {
+public final class NamedDatabaseRuleItemNodePath {
private final String type;
@@ -38,7 +38,7 @@ public final class NamedRuleItemNodePath {
@Getter
private final VersionNodePathParser versionNodePathParser;
- public NamedRuleItemNodePath(final DatabaseRuleRootNodePath rootNodePath,
final String type) {
+ public NamedDatabaseRuleItemNodePath(final DatabaseRuleRootNodePath
rootNodePath, final String type) {
this.type = type;
String pattern = String.join("/", rootNodePath.getNodePrefix() + type,
NodePathPattern.GROUPED_IDENTIFIER);
versionNodePathParser = new VersionNodePathParser(pattern);
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueRuleItemNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueDatabaseRuleItemNodePath.java
similarity index 83%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueRuleItemNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueDatabaseRuleItemNodePath.java
index 583845ea57a..4f3cbdabd3a 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueRuleItemNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueDatabaseRuleItemNodePath.java
@@ -22,9 +22,9 @@ import
org.apache.shardingsphere.mode.node.path.config.database.root.DatabaseRul
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
/**
- * Unique rule item node path.
+ * Unique database rule item node path.
*/
-public final class UniqueRuleItemNodePath {
+public final class UniqueDatabaseRuleItemNodePath {
private final String parentNode;
@@ -33,13 +33,13 @@ public final class UniqueRuleItemNodePath {
@Getter
private final VersionNodePathParser versionNodePathParser;
- public UniqueRuleItemNodePath(final DatabaseRuleRootNodePath
databaseRuleRootNodePath, final String type) {
+ public UniqueDatabaseRuleItemNodePath(final DatabaseRuleRootNodePath
databaseRuleRootNodePath, final String type) {
parentNode = null;
this.type = type;
versionNodePathParser = new
VersionNodePathParser(databaseRuleRootNodePath.getNodePrefix() + type);
}
- public UniqueRuleItemNodePath(final DatabaseRuleRootNodePath
databaseRuleRootNodePath, final String parentNode, final String type) {
+ public UniqueDatabaseRuleItemNodePath(final DatabaseRuleRootNodePath
databaseRuleRootNodePath, final String parentNode, final String type) {
this.parentNode = parentNode;
this.type = type;
versionNodePathParser = new VersionNodePathParser(String.join("/",
databaseRuleRootNodePath.getNodePrefix() + parentNode, type));
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/RuleNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/RuleNodePathTest.java
index b043b077e5d..7fed384a0ad 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/RuleNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/RuleNodePathTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.mode.node.path.config.database;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedRuleItemNodePath;
-import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.NamedDatabaseRuleItemNodePath;
+import
org.apache.shardingsphere.mode.node.path.config.database.item.UniqueDatabaseRuleItemNodePath;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -42,15 +42,15 @@ class RuleNodePathTest {
@Test
void assertFindNameByVersion() {
- NamedRuleItemNodePath namedRulePath =
databaseRuleNodePath.getNamedItem("tables");
+ NamedDatabaseRuleItemNodePath namedRulePath =
databaseRuleNodePath.getNamedItem("tables");
assertThat(namedRulePath.getPath("foo_tbl"), is("tables/foo_tbl"));
}
@Test
void assertGetUniqueItem() {
- UniqueRuleItemNodePath uniqueRulePath =
databaseRuleNodePath.getUniqueItem("tables");
+ UniqueDatabaseRuleItemNodePath uniqueRulePath =
databaseRuleNodePath.getUniqueItem("tables");
assertThat(uniqueRulePath.getPath(), is("tables"));
- UniqueRuleItemNodePath uniqueRulePathWithType =
databaseRuleNodePath.getUniqueItem("type");
+ UniqueDatabaseRuleItemNodePath uniqueRulePathWithType =
databaseRuleNodePath.getUniqueItem("type");
assertThat(uniqueRulePathWithType.getPath(), is("tables/type"));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePathTest.java
similarity index 91%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePathTest.java
index 17ee11fa854..e3b443c39af 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePathTest.java
@@ -27,9 +27,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class NamedRuleItemNodePathTest {
+class NamedDatabaseRuleItemNodePathTest {
- private final NamedRuleItemNodePath nodePath = new
NamedRuleItemNodePath(new DatabaseRuleRootNodePath("foo"), "tables");
+ private final NamedDatabaseRuleItemNodePath nodePath = new
NamedDatabaseRuleItemNodePath(new DatabaseRuleRootNodePath("foo"), "tables");
@Test
void assertGetPath() {
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueRuleItemNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueDatabaseRuleItemNodePathTest.java
similarity index 69%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueRuleItemNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueDatabaseRuleItemNodePathTest.java
index 914ec2fd45e..75a8ec8bec6 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueRuleItemNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/config/database/item/UniqueDatabaseRuleItemNodePathTest.java
@@ -23,17 +23,17 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class UniqueRuleItemNodePathTest {
+class UniqueDatabaseRuleItemNodePathTest {
@Test
void assertPathWithNullParentNode() {
- UniqueRuleItemNodePath uniqueRuleItemNodePath = new
UniqueRuleItemNodePath(new DatabaseRuleRootNodePath("foo"), "test_path");
- assertThat(uniqueRuleItemNodePath.getPath(), is("test_path"));
+ UniqueDatabaseRuleItemNodePath uniqueDatabaseRuleItemNodePath = new
UniqueDatabaseRuleItemNodePath(new DatabaseRuleRootNodePath("foo"),
"test_path");
+ assertThat(uniqueDatabaseRuleItemNodePath.getPath(), is("test_path"));
}
@Test
void assertGetPathWithParentNode() {
- UniqueRuleItemNodePath uniqueRuleItemNodePath = new
UniqueRuleItemNodePath(new DatabaseRuleRootNodePath("foo"), "test_parent",
"test_path");
- assertThat(uniqueRuleItemNodePath.getPath(),
is("test_parent/test_path"));
+ UniqueDatabaseRuleItemNodePath uniqueDatabaseRuleItemNodePath = new
UniqueDatabaseRuleItemNodePath(new DatabaseRuleRootNodePath("foo"),
"test_parent", "test_path");
+ assertThat(uniqueDatabaseRuleItemNodePath.getPath(),
is("test_parent/test_path"));
}
}
