Refactor alterRuleConfiguration and removeRuleConfigurationItem inter…

…face in StandaloneModeContextManager
apache · May 22, 2024 · 7ea04f2 · 7ea04f2
1 parent 9e58dbc
commit 7ea04f2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/.../java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java b/.../java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -269,28 +269,29 @@ public Collection<MetaDataVersion> alterRuleConfiguration(final String databaseN
             Collection<MetaDataVersion> metaDataVersions = contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService()
                     .persistConfigurations(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(), Collections.singletonList(toBeAlteredRuleConfig));
             contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(metaDataVersions);
-            sendDatabaseRuleChangedEvent(databaseName, metaDataVersions);
+            sendDatabaseRuleChangedEvent(databaseName, metaDataVersions, Type.UPDATED);
             clearServiceCache();
         }
         return Collections.emptyList();
     }
 
-    private void sendDatabaseRuleChangedEvent(final String databaseName, final Collection<MetaDataVersion> metaDataVersions) {
+    private void sendDatabaseRuleChangedEvent(final String databaseName, final Collection<MetaDataVersion> metaDataVersions, final Type type) {
         for (MetaDataVersion each : metaDataVersions) {
-            sendDatabaseRuleChangedEvent(databaseName, each);
+            sendDatabaseRuleChangedEvent(databaseName, each, type);
         }
     }
 
-    private void sendDatabaseRuleChangedEvent(final String databaseName, final MetaDataVersion metaDataVersion) {
-        ruleConfigurationEventBuilder.build(databaseName, new DataChangedEvent(metaDataVersion.getActiveVersionNodePath(), metaDataVersion.getNextActiveVersion(), Type.UPDATED))
+    private void sendDatabaseRuleChangedEvent(final String databaseName, final MetaDataVersion metaDataVersion, final Type type) {
+        ruleConfigurationEventBuilder.build(databaseName, new DataChangedEvent(metaDataVersion.getActiveVersionNodePath(), metaDataVersion.getNextActiveVersion(), type))
                 .ifPresent(optional -> contextManager.getComputeNodeInstanceContext().getEventBusContext().post(optional));
     }
 
     @Override
     public void removeRuleConfigurationItem(final String databaseName, final RuleConfiguration toBeRemovedRuleConfig) {
         if (null != toBeRemovedRuleConfig) {
             sendDatabaseRuleChangedEvent(databaseName,
-                    contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().deleteConfigurations(databaseName, Collections.singleton(toBeRemovedRuleConfig)));
+                    contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().deleteConfigurations(databaseName,
+                            Collections.singleton(toBeRemovedRuleConfig)), Type.DELETED);
             clearServiceCache();
         }
     }