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 aa84856573f Rename StatesNodePath (#34265)
aa84856573f is described below
commit aa84856573f483951db6d3602b63c951c6d76c92
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 6 13:15:42 2025 +0800
Rename StatesNodePath (#34265)
---
.../persist/node/{StatesNode.java => StatesNodePath.java} | 14 +++++++-------
.../node/{StatesNodeTest.java => StatesNodePathTest.java} | 14 +++++++-------
.../service/unified/ListenerAssistedPersistService.java | 6 +++---
.../mode/persist/service/unified/StatePersistService.java | 6 +++---
.../handler/global/ClusterStateChangedHandler.java | 4 ++--
.../handler/global/ListenerAssistedChangedHandler.java | 6 +++---
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNode.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePath.java
similarity index 88%
rename from
kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNode.java
rename to
kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePath.java
index b173c40e606..d290740244a 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNode.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePath.java
@@ -25,10 +25,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * States node.
+ * States node path.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class StatesNode {
+public final class StatesNodePath {
private static final String ROOT_NODE = "states";
@@ -37,11 +37,11 @@ public final class StatesNode {
private static final String LISTENER_ASSISTED_NODE = "listener_assisted";
/**
- * Get cluster state node path.
+ * Get cluster state path.
*
- * @return cluster state node path
+ * @return cluster state path
*/
- public static String getClusterStateNodePath() {
+ public static String getClusterStatePath() {
return String.join("/", "", ROOT_NODE, CLUSTER_STATE_NODE);
}
@@ -57,10 +57,10 @@ public final class StatesNode {
/**
* Get database name by listener assisted node path.
*
- * @param nodePath node path
+ * @param nodePath path
* @return database name
*/
- public static Optional<String>
getDatabaseNameByListenerAssistedNodePath(final String nodePath) {
+ public static Optional<String>
findDatabaseNameByListenerAssistedNodePath(final String nodePath) {
Pattern pattern = Pattern.compile(getListenerAssistedNodePath() +
"/(\\w+)$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(nodePath);
return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
diff --git
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/StatesNodeTest.java
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePathTest.java
similarity index 69%
rename from
kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/StatesNodeTest.java
rename to
kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePathTest.java
index 2d50d1994b4..1cd3d7b716f 100644
---
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/StatesNodeTest.java
+++
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePathTest.java
@@ -23,25 +23,25 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class StatesNodeTest {
+class StatesNodePathTest {
@Test
- void assertGetClusterStateNodePath() {
- assertThat(StatesNode.getClusterStateNodePath(),
is("/states/cluster_state"));
+ void assertGetClusterStatePath() {
+ assertThat(StatesNodePath.getClusterStatePath(),
is("/states/cluster_state"));
}
@Test
void assertGetListenerAssistedNodePath() {
- assertThat(StatesNode.getListenerAssistedNodePath(),
is("/states/listener_assisted"));
+ assertThat(StatesNodePath.getListenerAssistedNodePath(),
is("/states/listener_assisted"));
}
@Test
- void assertGetDatabaseNameByListenerAssistedNodePath() {
-
assertTrue(StatesNode.getDatabaseNameByListenerAssistedNodePath("/states/listener_assisted/foo_db").isPresent());
+ void assertFindDatabaseNameByListenerAssistedNodePath() {
+
assertTrue(StatesNodePath.findDatabaseNameByListenerAssistedNodePath("/states/listener_assisted/foo_db").isPresent());
}
@Test
void assertGetDatabaseNameListenerAssistedNodePath() {
-
assertThat(StatesNode.getDatabaseNameListenerAssistedNodePath("foo_db"),
is("/states/listener_assisted/foo_db"));
+
assertThat(StatesNodePath.getDatabaseNameListenerAssistedNodePath("foo_db"),
is("/states/listener_assisted/foo_db"));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
index 1a422c3dfa3..514e9fe4355 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.persist.service.unified;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.metadata.persist.node.StatesNode;
+import org.apache.shardingsphere.metadata.persist.node.StatesNodePath;
import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
@@ -36,7 +36,7 @@ public final class ListenerAssistedPersistService {
* @param listenerAssistedType listener assisted type
*/
public void persistDatabaseNameListenerAssisted(final String databaseName,
final ListenerAssistedType listenerAssistedType) {
-
repository.persistEphemeral(StatesNode.getDatabaseNameListenerAssistedNodePath(databaseName),
listenerAssistedType.name());
+
repository.persistEphemeral(StatesNodePath.getDatabaseNameListenerAssistedNodePath(databaseName),
listenerAssistedType.name());
}
/**
@@ -45,6 +45,6 @@ public final class ListenerAssistedPersistService {
* @param databaseName database name
*/
public void deleteDatabaseNameListenerAssisted(final String databaseName) {
-
repository.delete(StatesNode.getDatabaseNameListenerAssistedNodePath(databaseName));
+
repository.delete(StatesNodePath.getDatabaseNameListenerAssistedNodePath(databaseName));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
index 4a0c8bc4cb4..4cdb6db058b 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.persist.service.unified;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.state.ClusterState;
-import org.apache.shardingsphere.metadata.persist.node.StatesNode;
+import org.apache.shardingsphere.metadata.persist.node.StatesNodePath;
import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
@@ -37,7 +37,7 @@ public final class StatePersistService {
* @param state to be updated cluster state
*/
public void update(final ClusterState state) {
- repository.persist(StatesNode.getClusterStateNodePath(), state.name());
+ repository.persist(StatesNodePath.getClusterStatePath(), state.name());
}
/**
@@ -46,7 +46,7 @@ public final class StatePersistService {
* @return loaded cluster state
*/
public ClusterState load() {
- String value = repository.query(StatesNode.getClusterStateNodePath());
+ String value = repository.query(StatesNodePath.getClusterStatePath());
return Strings.isNullOrEmpty(value) ? ClusterState.OK :
ClusterState.valueOf(value);
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
index d52e21c7aa3..304aaa11e0f 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
-import org.apache.shardingsphere.metadata.persist.node.StatesNode;
+import org.apache.shardingsphere.metadata.persist.node.StatesNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -34,7 +34,7 @@ public final class ClusterStateChangedHandler implements
DataChangedEventHandler
@Override
public String getSubscribedKey() {
- return StatesNode.getClusterStateNodePath();
+ return StatesNodePath.getClusterStatePath();
}
@Override
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
index fcd761fc053..85accfd61bd 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNodePath;
-import org.apache.shardingsphere.metadata.persist.node.StatesNode;
+import org.apache.shardingsphere.metadata.persist.node.StatesNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -39,7 +39,7 @@ public final class ListenerAssistedChangedHandler implements
DataChangedEventHan
@Override
public String getSubscribedKey() {
- return StatesNode.getListenerAssistedNodePath();
+ return StatesNodePath.getListenerAssistedNodePath();
}
@Override
@@ -49,7 +49,7 @@ public final class ListenerAssistedChangedHandler implements
DataChangedEventHan
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
-
StatesNode.getDatabaseNameByListenerAssistedNodePath(event.getKey()).ifPresent(optional
-> handle(contextManager, optional,
ListenerAssistedType.valueOf(event.getValue())));
+
StatesNodePath.findDatabaseNameByListenerAssistedNodePath(event.getKey()).ifPresent(optional
-> handle(contextManager, optional,
ListenerAssistedType.valueOf(event.getValue())));
}
private static void handle(final ContextManager contextManager, final
String databaseName, final ListenerAssistedType listenerAssistedType) {
