From 31be6af31ea389c97e70540a9ebf90aa64330bba Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 13 Feb 2025 17:23:34 +0800 Subject: [PATCH 1/2] Refactor GlobalRuleChangedHandler --- .../config/database/DatabaseRulePersistServiceTest.java | 6 +++--- .../config/global/GlobalRulePersistServiceTest.java | 2 +- .../handler/global/type/GlobalRuleChangedHandler.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 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 1c5bcf4415f86..fccaa5325df97 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 @@ void assertPersistWithActiveVersion() { } @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 3f87377f7a65f..83fee559ac07f 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 @@ void assertLoad() { } @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 2e9d1cc44e88d..b3e38bd2e3d65 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 Collection getSubscribedTypes() { @Override public void handle(final ContextManager contextManager, final DataChangedEvent event) { - Optional ruleTypeName = GlobalRuleNodePath.getVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(), 1); - if (!ruleTypeName.isPresent()) { + Optional ruleType = GlobalRuleNodePath.getVersionNodePathParser().findIdentifierByActiveVersionPath(event.getKey(), 1); + if (!ruleType.isPresent()) { return; } ActiveVersionChecker.checkActiveVersion(contextManager, event); - Optional ruleConfig = contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getGlobalRuleService().load(ruleTypeName.get()); - Preconditions.checkArgument(ruleConfig.isPresent(), "Can not find rule configuration with name: %s", ruleTypeName.get()); + Optional 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()); } } From ba615338510b3681f721f236105e4751becc37e6 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Thu, 13 Feb 2025 17:24:51 +0800 Subject: [PATCH 2/2] Refactor GlobalRuleChangedHandlerTest --- .../handler/global/type/GlobalRuleChangedHandlerTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 7e5d46de78a7f..0f5351f9e15cc 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 @@ void assertHandleWithEmptyRuleName() { @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));