Refactor CreateDatabaseRuleRDLExecuteEngine (#29820)

* Remove useless generic type on RuleDefinitionBackendHandler * Refactor CreateDatabaseRuleRDLExecuteEngine * Refactor DropDatabaseRuleRDLExecuteEngine
apache · Jan 23, 2024 · 30c1ec4 · 30c1ec4
1 parent 48d669c
commit 30c1ec4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...nd/handler/distsql/rdl/rule/database/execute/type/CreateDatabaseRuleRDLExecuteEngine.java b/...nd/handler/distsql/rdl/rule/database/execute/type/CreateDatabaseRuleRDLExecuteEngine.java
@@ -49,9 +49,7 @@ public final class CreateDatabaseRuleRDLExecuteEngine implements DatabaseRuleRDL
     @SuppressWarnings("unchecked")
     public Collection<MetaDataVersion> execute(final RuleDefinitionStatement sqlStatement, final ShardingSphereDatabase database, final RuleConfiguration currentRuleConfig) {
         RuleConfiguration toBeCreatedRuleConfig = executor.buildToBeCreatedRuleConfiguration(currentRuleConfig, sqlStatement);
-        if (null != currentRuleConfig) {
-            executor.updateCurrentRuleConfiguration(currentRuleConfig, toBeCreatedRuleConfig);
-        }
+        executor.updateCurrentRuleConfiguration(currentRuleConfig, toBeCreatedRuleConfig);
         ModeContextManager modeContextManager = ProxyContext.getInstance().getContextManager().getInstanceContext().getModeContextManager();
         return modeContextManager.alterRuleConfiguration(database.getName(), getToBeCreatedRuleConfiguration(sqlStatement, database, currentRuleConfig, toBeCreatedRuleConfig));
     }

diff --git a/...kend/handler/distsql/rdl/rule/database/execute/type/DropDatabaseRuleRDLExecuteEngine.java b/...kend/handler/distsql/rdl/rule/database/execute/type/DropDatabaseRuleRDLExecuteEngine.java
@@ -56,7 +56,7 @@ public Collection<MetaDataVersion> execute(final RuleDefinitionStatement sqlStat
         if (executor.updateCurrentRuleConfiguration(sqlStatement, currentRuleConfig) && ((DatabaseRuleConfiguration) currentRuleConfig).isEmpty()) {
             modeContextManager.removeRuleConfigurationItem(database.getName(), toBeDroppedRuleConfig);
             new NewYamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(Collections.singleton(currentRuleConfig)).values().stream().findFirst()
-                    .ifPresent(swapper -> modeContextManager.removeRuleConfiguration(database.getName(), swapper.getRuleTagName().toLowerCase()));
+                    .ifPresent(optional -> modeContextManager.removeRuleConfiguration(database.getName(), optional.getRuleTagName().toLowerCase()));
             return Collections.emptyList();
         }
         if (executor instanceof DropReadwriteSplittingRuleExecutor) {