This is an automated email from the ASF dual-hosted git repository. yx9o 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 443c252efd1 Refactor ImportRuleConfigurationProvider's impl (#30620) 443c252efd1 is described below commit 443c252efd1e0e1c64a48fdaa5f552970ded5d76 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun Mar 24 01:02:58 2024 +0800 Refactor ImportRuleConfigurationProvider's impl (#30620) --- .../handler/provider/EncryptImportRuleConfigurationProvider.java | 3 --- .../distsql/handler/provider/MaskImportRuleConfigurationProvider.java | 3 --- .../provider/ReadwriteSplittingImportRuleConfigurationProvider.java | 3 --- .../handler/provider/ShadowImportRuleConfigurationProvider.java | 3 --- .../handler/provider/ShardingImportRuleConfigurationProvider.java | 3 --- 5 files changed, 15 deletions(-) diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptImportRuleConfigurationProvider.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptImportRuleConfigurationProvider.java index 256ef53fcf5..cfc33a2bdaf 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptImportRuleConfigurationProvider.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptImportRuleConfigurationProvider.java @@ -42,9 +42,6 @@ public final class EncryptImportRuleConfigurationProvider implements ImportRuleC @Override public void check(final ShardingSphereDatabase database, final EncryptRuleConfiguration ruleConfig) { - if (null == database || null == ruleConfig) { - return; - } checkTables(database.getName(), ruleConfig); checkEncryptors(ruleConfig); checkTableEncryptorsExisted(database.getName(), ruleConfig); diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskImportRuleConfigurationProvider.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskImportRuleConfigurationProvider.java index a2b9dbc5320..68649bdaf2d 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskImportRuleConfigurationProvider.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskImportRuleConfigurationProvider.java @@ -39,9 +39,6 @@ public final class MaskImportRuleConfigurationProvider implements ImportRuleConf @Override public void check(final ShardingSphereDatabase database, final MaskRuleConfiguration ruleConfig) { - if (null == database || null == ruleConfig) { - return; - } checkTables(database.getName(), ruleConfig); checkMaskAlgorithms(ruleConfig); checkMaskAlgorithmsExisted(database.getName(), ruleConfig); diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingImportRuleConfigurationProvider.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingImportRuleConfigurationProvider.java index 9d6e67d5041..9be7a390639 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingImportRuleConfigurationProvider.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingImportRuleConfigurationProvider.java @@ -38,9 +38,6 @@ public final class ReadwriteSplittingImportRuleConfigurationProvider implements @Override public void check(final ShardingSphereDatabase database, final ReadwriteSplittingRuleConfiguration ruleConfig) { - if (null == database || null == ruleConfig) { - return; - } checkDataSources(database, ruleConfig); checkLoadBalancers(ruleConfig); } diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowImportRuleConfigurationProvider.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowImportRuleConfigurationProvider.java index e7be1cfce6a..da3bab54f63 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowImportRuleConfigurationProvider.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowImportRuleConfigurationProvider.java @@ -39,9 +39,6 @@ public final class ShadowImportRuleConfigurationProvider implements ImportRuleCo @Override public void check(final ShardingSphereDatabase database, final ShadowRuleConfiguration ruleConfig) { - if (null == database || null == ruleConfig) { - return; - } checkDataSources(database, ruleConfig); checkTables(database.getName(), ruleConfig); checkShadowAlgorithms(ruleConfig); diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingImportRuleConfigurationProvider.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingImportRuleConfigurationProvider.java index 601891adc7f..83e6a199f74 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingImportRuleConfigurationProvider.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingImportRuleConfigurationProvider.java @@ -48,9 +48,6 @@ public final class ShardingImportRuleConfigurationProvider implements ImportRule @Override public void check(final ShardingSphereDatabase database, final ShardingRuleConfiguration ruleConfig) { - if (null == database || null == ruleConfig) { - return; - } checkLogicTables(database.getName(), ruleConfig); checkDataSources(database, ruleConfig); checkShardingAlgorithms(ruleConfig.getShardingAlgorithms().values());