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 f7949eb8d50 Refactor GlobalRuleChangedHandler (#34662)
f7949eb8d50 is described below
commit f7949eb8d507895afb6cffa83cb9621dc3a8583a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 13 17:27:05 2025 +0800
Refactor GlobalRuleChangedHandler (#34662)
* Refactor GlobalRuleChangedHandler
* Refactor GlobalRuleChangedHandlerTest
---
.../persist/config/database/DatabaseRulePersistServiceTest.java | 6 +++---
.../persist/config/global/GlobalRulePersistServiceTest.java | 2 +-
.../dispatch/handler/global/type/GlobalRuleChangedHandler.java | 8 ++++----
.../handler/global/type/GlobalRuleChangedHandlerTest.java | 3 +--
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
index 1c5bcf4415f..fccaa5325df 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistServiceTest.java
@@ -78,9 +78,9 @@ class DatabaseRulePersistServiceTest {
}
@Test
- void assertDeleteWithRuleTypeName() {
- persistService.delete("foo_db", "fixture_rule");
- verify(repository).delete("/metadata/foo_db/rules/fixture_rule");
+ void assertDeleteWithRuleType() {
+ persistService.delete("foo_db", "foo_rule");
+ verify(repository).delete("/metadata/foo_db/rules/foo_rule");
}
@Test
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
index 3f87377f7a6..83fee559ac0 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
@@ -71,7 +71,7 @@ class GlobalRulePersistServiceTest {
}
@Test
- void assertLoadWithRuleTypeName() {
+ void assertLoadWithRuleType() {
assertFalse(globalRulePersistService.load("foo_rule").isPresent());
verify(repositoryTuplePersistService).load("/rules/foo_rule");
}
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 2e9d1cc44e8..b3e38bd2e3d 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
@@ -47,13 +47,13 @@ public final class GlobalRuleChangedHandler implements
GlobalDataChangedEventHan
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
- Optional<String> ruleTypeName =
GlobalRuleNodePath.getVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(),
1);
- if (!ruleTypeName.isPresent()) {
+ Optional<String> ruleType =
GlobalRuleNodePath.getVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(),
1);
+ if (!ruleType.isPresent()) {
return;
}
ActiveVersionChecker.checkActiveVersion(contextManager, event);
- Optional<RuleConfiguration> ruleConfig =
contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getGlobalRuleService().load(ruleTypeName.get());
- Preconditions.checkArgument(ruleConfig.isPresent(), "Can not find rule
configuration with name: %s", ruleTypeName.get());
+ Optional<RuleConfiguration> ruleConfig =
contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getGlobalRuleService().load(ruleType.get());
+ Preconditions.checkArgument(ruleConfig.isPresent(), "Can not find rule
configuration with name: %s", ruleType.get());
contextManager.getMetaDataContextManager().getGlobalConfigurationManager().alterGlobalRuleConfiguration(ruleConfig.get());
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java
index 7e5d46de78a..0f5351f9e15 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/GlobalRuleChangedHandlerTest.java
@@ -66,8 +66,7 @@ class GlobalRuleChangedHandlerTest {
@Test
void assertHandle() {
-
when(contextManager.getPersistServiceFacade().getRepository().query("/rules/foo_rule/active_version"))
- .thenReturn("rule_value");
+
when(contextManager.getPersistServiceFacade().getRepository().query("/rules/foo_rule/active_version")).thenReturn("rule_value");
RuleConfiguration ruleConfig = mock(RuleConfiguration.class);
when(contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getGlobalRuleService().load("foo_rule")).thenReturn(Optional.of(ruleConfig));
handler.handle(contextManager, new
DataChangedEvent("/rules/foo_rule/active_version", "rule_value", Type.ADDED));
