You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2021/06/01 13:52:47 UTC

[shardingsphere] branch master updated: Minor refactor GlobalRuleChangedListener (#10610)

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 cf2c610  Minor refactor GlobalRuleChangedListener (#10610)
cf2c610 is described below

commit cf2c6104d58983b66045252e65e7d32ce7c2b9ba
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Tue Jun 1 21:52:26 2021 +0800

    Minor refactor GlobalRuleChangedListener (#10610)
---
 .../governance/context/metadata/GovernanceMetaDataContextsTest.java     | 2 +-
 .../watcher/event/rule/GlobalRuleConfigurationsChangedEvent.java        | 2 --
 .../governance/core/registry/watcher/impl/GlobalRuleChangedWatcher.java | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
index a43cbd5..fd510de 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContextsTest.java
@@ -202,7 +202,7 @@ public final class GovernanceMetaDataContextsTest {
 
     @Test
     public void assertGlobalRuleConfigurationsChanged() {
-        GlobalRuleConfigurationsChangedEvent event = new GlobalRuleConfigurationsChangedEvent("", getChangedGlobalRuleConfigurations());
+        GlobalRuleConfigurationsChangedEvent event = new GlobalRuleConfigurationsChangedEvent(getChangedGlobalRuleConfigurations());
         governanceMetaDataContexts.renew(event);
         assertThat(governanceMetaDataContexts.getGlobalRuleMetaData(), not(globalRuleMetaData));
     }
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/event/rule/GlobalRuleConfigurationsChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/event/rule/GlobalRuleConfigurationsChangedEvent.java
index 5b1869e..b821e81 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/event/rule/GlobalRuleConfigurationsChangedEvent.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/event/rule/GlobalRuleConfigurationsChangedEvent.java
@@ -31,7 +31,5 @@ import java.util.Collection;
 @Getter
 public final class GlobalRuleConfigurationsChangedEvent implements GovernanceEvent {
     
-    private final String schemaName;
-    
     private final Collection<RuleConfiguration> ruleConfigurations;
 }
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/impl/GlobalRuleChangedWatcher.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/impl/GlobalRuleChangedWatcher.java
index bfbb2db..41861ec 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/impl/GlobalRuleChangedWatcher.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/watcher/impl/GlobalRuleChangedWatcher.java
@@ -49,7 +49,7 @@ public final class GlobalRuleChangedWatcher implements GovernanceWatcher<GlobalR
     
     @Override
     public Optional<GlobalRuleConfigurationsChangedEvent> createGovernanceEvent(final DataChangedEvent event) {
-        return Optional.of(new GlobalRuleConfigurationsChangedEvent("", getGlobalRuleConfigurations(event)));
+        return Optional.of(new GlobalRuleConfigurationsChangedEvent(getGlobalRuleConfigurations(event)));
     }
     
     @SuppressWarnings("unchecked")