This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 c8cca609dea Fix sonar issue (#29813)
c8cca609dea is described below
commit c8cca609deac9c08312f53f46a27c34f3e91fa87
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jan 23 16:32:39 2024 +0800
Fix sonar issue (#29813)
---
.../validator/ddl/impl/ShardingDropTableStatementValidator.java | 8 +-------
.../rule/changed/DefaultKeyGenerateStrategyChangedProcessor.java | 2 +-
.../changed/DefaultShardingAuditorStrategyChangedProcessor.java | 2 +-
.../changed/DefaultTableShardingStrategyChangedProcessor.java | 2 +-
.../sharding/rule/changed/ShardingAuditorChangedProcessor.java | 2 +-
.../sharding/rule/changed/ShardingAutoTableChangedProcessor.java | 2 +-
.../sharding/rule/changed/ShardingCacheChangedProcessor.java | 2 +-
.../sharding/rule/changed/ShardingTableChangedProcessor.java | 2 +-
.../distsql/handler/query/ShardingCountResultRowBuilder.java | 3 +--
9 files changed, 9 insertions(+), 16 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
index b0823bb795a..3a4987ba45e 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
@@ -38,7 +38,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableSt
import
org.apache.shardingsphere.sql.parser.sql.dialect.handler.ddl.DropTableStatementHandler;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -77,7 +76,6 @@ public final class ShardingDropTableStatementValidator
extends ShardingDDLStatem
}
private void checkTableInUsed(final ShardingRule shardingRule, final
SQLStatementContext sqlStatementContext, final RouteContext routeContext) {
- Collection<String> inUsedTables = new LinkedList<>();
Collection<String> dropTables =
sqlStatementContext.getTablesContext().getTableNames();
Set<String> actualTables =
routeContext.getRouteUnits().stream().flatMap(each ->
each.getTableMappers().stream().map(RouteMapper::getActualName)).collect(Collectors.toSet());
// TODO check actual tables not be used in multi rules, and remove
this check logic
@@ -86,11 +84,7 @@ public final class ShardingDropTableStatementValidator
extends ShardingDDLStatem
if (otherRuleActualTables.isEmpty()) {
return;
}
- for (String each : actualTables) {
- if (otherRuleActualTables.contains(each)) {
- inUsedTables.add(each);
- }
- }
+ Collection<String> inUsedTables =
actualTables.stream().filter(otherRuleActualTables::contains).collect(Collectors.toList());
ShardingSpherePreconditions.checkState(inUsedTables.isEmpty(), () ->
new DropInUsedTablesException(inUsedTables));
}
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultKeyGenerateStrategyChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultKeyGenerateStrategyChangedProcessor.java
index 80b4450f3b0..f5569e36b95 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultKeyGenerateStrategyChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultKeyGenerateStrategyChangedProcessor.java
@@ -41,7 +41,7 @@ public final class DefaultKeyGenerateStrategyChangedProcessor
implements RuleIte
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingAuditorStrategyChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingAuditorStrategyChangedProcessor.java
index e34de50df3f..2c62d3d1a03 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingAuditorStrategyChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingAuditorStrategyChangedProcessor.java
@@ -41,7 +41,7 @@ public final class
DefaultShardingAuditorStrategyChangedProcessor implements Rul
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultTableShardingStrategyChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultTableShardingStrategyChangedProcessor.java
index 3ffbef61397..95aee067456 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultTableShardingStrategyChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultTableShardingStrategyChangedProcessor.java
@@ -41,7 +41,7 @@ public final class
DefaultTableShardingStrategyChangedProcessor implements RuleI
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessor.java
index d32c80a5701..2cd30202cfc 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAuditorChangedProcessor.java
@@ -43,7 +43,7 @@ public final class ShardingAuditorChangedProcessor implements
RuleItemConfigurat
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAutoTableChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAutoTableChangedProcessor.java
index 99826b182ff..c3d61106ea1 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAutoTableChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAutoTableChangedProcessor.java
@@ -43,7 +43,7 @@ public final class ShardingAutoTableChangedProcessor
implements RuleItemConfigur
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingCacheChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingCacheChangedProcessor.java
index 171147ddc2b..74d45cafe80 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingCacheChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingCacheChangedProcessor.java
@@ -41,7 +41,7 @@ public final class ShardingCacheChangedProcessor implements
RuleItemConfiguratio
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableChangedProcessor.java
index 0cf2c46c007..0d4a28cba8a 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableChangedProcessor.java
@@ -43,7 +43,7 @@ public final class ShardingTableChangedProcessor implements
RuleItemConfiguratio
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
index 7d4a228039c..673bdfb3b6c 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.sharding.distsql.handler.query;
import
org.apache.shardingsphere.distsql.handler.type.rql.count.CountResultRowBuilder;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import java.util.Arrays;
@@ -33,7 +32,7 @@ public final class ShardingCountResultRowBuilder implements
CountResultRowBuilde
@Override
public Collection<LocalDataQueryResultRow> generateRows(final ShardingRule
rule, final String databaseName) {
return Arrays.asList(new LocalDataQueryResultRow("sharding_table",
databaseName, rule.getTableRules().size()),
- new LocalDataQueryResultRow("sharding_table_reference",
databaseName, ((ShardingRuleConfiguration)
rule.getConfiguration()).getBindingTableGroups().size()));
+ new LocalDataQueryResultRow("sharding_table_reference",
databaseName, rule.getConfiguration().getBindingTableGroups().size()));
}
@Override
