(shardingsphere) branch master updated: Remove useless null check and use checkNotEmpty to replace checkState in ShardingRuleBuilder (#30937)

[miaoliyao]

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

miaoliyao 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 10e26df2d27 Remove useless null check and use checkNotEmpty to replace 
checkState in ShardingRuleBuilder (#30937)
10e26df2d27 is described below

commit 10e26df2d271a5ec5122f0e7b2e797854c07ca42
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Wed Apr 17 14:48:27 2024 +0800

    Remove useless null check and use checkNotEmpty to replace checkState in 
ShardingRuleBuilder (#30937)
    
    * Remove useless null check and use checkNotEmpty to replace checkState in 
ShardingRuleBuilder
    
    * remove invalid unit test
    
    * remove invalid unit test
---
 .../shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java  | 2 +-
 .../sharding/rule/builder/ShardingRuleBuilderTest.java             | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
 
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
index d1d6efd3935..06a20af5bba 100644
--- 
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
+++ 
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
@@ -39,7 +39,7 @@ public final class ShardingRuleBuilder implements 
DatabaseRuleBuilder<ShardingRu
     @Override
     public ShardingRule build(final ShardingRuleConfiguration config, final 
String databaseName, final DatabaseType protocolType,
                               final Map<String, DataSource> dataSources, final 
Collection<ShardingSphereRule> builtRules, final InstanceContext 
instanceContext) {
-        ShardingSpherePreconditions.checkState(null != dataSources && 
!dataSources.isEmpty(), () -> new 
MissingRequiredShardingConfigurationException("Data source", databaseName));
+        ShardingSpherePreconditions.checkNotEmpty(dataSources, () -> new 
MissingRequiredShardingConfigurationException("Data source", databaseName));
         return new ShardingRule(config, dataSources, instanceContext);
     }
     
diff --git 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilderTest.java
 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilderTest.java
index e1c80628f16..9dcc26358e6 100644
--- 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilderTest.java
+++ 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilderTest.java
@@ -56,13 +56,6 @@ class ShardingRuleBuilderTest {
                 Collections.singletonMap("name", mock(DataSource.class, 
RETURNS_DEEP_STUBS)), Collections.emptyList(), mock(InstanceContext.class)), 
instanceOf(ShardingRule.class));
     }
     
-    @SuppressWarnings("unchecked")
-    @Test
-    void assertBuildWithNullDataSourceMap() {
-        assertThrows(MissingRequiredShardingConfigurationException.class,
-                () -> builder.build(ruleConfig, "sharding_db", new 
MySQLDatabaseType(), null, Collections.emptyList(), 
mock(InstanceContext.class)));
-    }
-    
     @SuppressWarnings("unchecked")
     @Test
     void assertBuildWithEmptyDataSourceMap() {