This is an automated email from the ASF dual-hosted git repository.
zichaowang 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 6d36f56e7e1 Unify null and not null check (#25774)
6d36f56e7e1 is described below
commit 6d36f56e7e14c7d6c6cbaa65dc65b11a1e6879f8
Author: Liang Zhang <[email protected]>
AuthorDate: Fri May 19 04:19:54 2023 +0800
Unify null and not null check (#25774)
---
.../distsql/handler/query/ShowEncryptRuleExecutor.java | 11 +++++------
.../parser/core/EncryptDistSQLStatementVisitor.java | 3 +--
.../distsql/handler/query/ShowMaskRuleExecutor.java | 3 +--
.../parser/core/MaskDistSQLStatementVisitor.java | 7 +++----
.../ReadwriteSplittingDistSQLStatementVisitor.java | 9 ++++-----
.../apache/shardingsphere/shadow/rule/ShadowRule.java | 5 ++---
.../query/ShowDefaultShadowAlgorithmExecutor.java | 3 +--
.../handler/query/ShowShadowAlgorithmExecutor.java | 3 +--
.../parser/core/ShadowDistSQLStatementVisitor.java | 3 +--
.../checker/ShardingTableRuleStatementChecker.java | 2 +-
.../handler/query/ShowShardingAlgorithmExecutor.java | 5 ++---
.../handler/query/ShowShardingTableRuleExecutor.java | 3 +--
.../query/ShowUnusedShardingAlgorithmsExecutor.java | 15 +++++++--------
.../query/ShowUnusedShardingAuditorsExecutor.java | 7 +++----
.../query/ShowUnusedShardingKeyGeneratorExecutor.java | 11 +++++------
.../update/DropShardingAlgorithmStatementUpdater.java | 7 +++----
.../update/DropShardingAuditorStatementUpdater.java | 7 +++----
.../DropShardingKeyGeneratorStatementUpdater.java | 7 +++----
.../update/DropShardingTableRuleStatementUpdater.java | 8 ++++----
.../distsql/handler/update/UnusedAlgorithmFinder.java | 6 +++---
.../parser/core/ShardingDistSQLStatementVisitor.java | 18 +++++++++---------
.../HikariDataSourcePoolPropertiesValidator.java | 3 +--
.../executor/sql/execute/engine/raw/RawExecutor.java | 7 +++----
.../rewrite/sql/token/pojo/generic/OwnerToken.java | 5 ++---
.../authority/yaml/swapper/YamlUserSwapper.java | 6 ++----
.../DefaultLoggingRuleConfigurationBuilder.java | 4 ++--
.../logging/yaml/swapper/YamlAppenderSwapper.java | 6 ++----
.../logging/yaml/swapper/YamlLoggerSwapper.java | 8 +++-----
.../manager/NarayanaXATransactionManagerProvider.java | 5 ++---
.../mode/repository/cluster/nacos/NacosRepository.java | 2 +-
.../cluster/nacos/listener/NamingEventListener.java | 7 +++----
.../repository/cluster/nacos/NacosRepositoryTest.java | 3 +--
.../ral/queryable/ExportStorageNodesExecutor.java | 5 ++---
.../distsql/ral/updatable/ImportMetaDataUpdater.java | 3 +--
.../adapter/impl/ShardingSphereJdbcContainer.java | 7 +++----
.../impl/ShardingSphereProxyClusterContainer.java | 3 +--
.../impl/ShardingSphereProxyStandaloneContainer.java | 7 +++----
.../container/jdbc/ShardingSphereJDBCContainer.java | 3 +--
38 files changed, 96 insertions(+), 131 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
index b5c9ba6f240..121c7638384 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -34,7 +34,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
-import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -57,7 +56,7 @@ public final class ShowEncryptRuleExecutor implements
RQLExecutor<ShowEncryptRul
}
private Collection<LocalDataQueryResultRow> buildData(final
EncryptRuleConfiguration ruleConfig, final ShowEncryptRulesStatement
sqlStatement) {
- return ruleConfig.getTables().stream().filter(each ->
Objects.isNull(sqlStatement.getTableName()) ||
each.getName().equals(sqlStatement.getTableName()))
+ return ruleConfig.getTables().stream().filter(each -> null ==
sqlStatement.getTableName() ||
each.getName().equals(sqlStatement.getTableName()))
.map(each -> buildColumnData(each, ruleConfig.getEncryptors()))
.flatMap(Collection::stream).collect(Collectors.toList());
}
@@ -76,10 +75,10 @@ public final class ShowEncryptRuleExecutor implements
RQLExecutor<ShowEncryptRul
each.getLikeQuery().map(EncryptColumnItemRuleConfiguration::getName).orElse(""),
encryptorAlgorithmConfig.getType(),
PropertiesConverter.convert(encryptorAlgorithmConfig.getProps()),
- Objects.isNull(assistedQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) : assistedQueryEncryptorAlgorithmConfig.getType(),
- Objects.isNull(assistedQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) :
PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
- Objects.isNull(likeQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) : likeQueryEncryptorAlgorithmConfig.getType(),
- Objects.isNull(likeQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) :
PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps()))));
+ null == assistedQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) : assistedQueryEncryptorAlgorithmConfig.getType(),
+ null == assistedQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) :
PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
+ null == likeQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) : likeQueryEncryptorAlgorithmConfig.getType(),
+ null == likeQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) :
PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps()))));
}
return result;
}
diff --git
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index a9e46c72a43..27a0faed8e9 100644
---
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -45,7 +45,6 @@ import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseS
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -125,6 +124,6 @@ public final class EncryptDistSQLStatementVisitor extends
EncryptDistSQLStatemen
@Override
public ASTNode visitCountEncryptRule(final CountEncryptRuleContext ctx) {
- return new
CountEncryptRuleStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new CountEncryptRuleStatement(null == ctx.databaseName() ? null
: (DatabaseSegment) visit(ctx.databaseName()));
}
}
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
index fe1ccb2c544..39cd45eae47 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
@@ -31,7 +31,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
-import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -51,7 +50,7 @@ public final class ShowMaskRuleExecutor implements
RQLExecutor<ShowMaskRulesStat
}
private Collection<LocalDataQueryResultRow> buildData(final
MaskRuleConfiguration ruleConfig, final ShowMaskRulesStatement sqlStatement) {
- return ruleConfig.getTables().stream().filter(each ->
Objects.isNull(sqlStatement.getTableName()) ||
each.getName().equals(sqlStatement.getTableName()))
+ return ruleConfig.getTables().stream().filter(each -> null ==
sqlStatement.getTableName() ||
each.getName().equals(sqlStatement.getTableName()))
.map(each -> buildColumnData(each,
ruleConfig.getMaskAlgorithms())).flatMap(Collection::stream).collect(Collectors.toList());
}
diff --git
a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
index 86fce1174ad..e8cb3353b01 100644
---
a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
+++
b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
@@ -22,14 +22,14 @@ import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementBase
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.AlgorithmDefinitionContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.AlterMaskRuleContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.ColumnDefinitionContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.CountMaskRuleContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.CreateMaskRuleContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.DatabaseNameContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.DropMaskRuleContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.MaskRuleDefinitionContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.PropertiesDefinitionContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.PropertyContext;
import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.ShowMaskRulesContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.CountMaskRuleContext;
-import
org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.DatabaseNameContext;
import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment;
import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment;
@@ -43,7 +43,6 @@ import
org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -75,7 +74,7 @@ public final class MaskDistSQLStatementVisitor extends
MaskDistSQLStatementBaseV
@Override
public ASTNode visitCountMaskRule(final CountMaskRuleContext ctx) {
- return new CountMaskRuleStatement(Objects.nonNull(ctx.databaseName())
? (DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new CountMaskRuleStatement(null == ctx.databaseName() ? null :
(DatabaseSegment) visit(ctx.databaseName()));
}
@Override
diff --git
a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
index d83e81af1ce..473488214ff 100644
---
a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
+++
b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
@@ -45,7 +45,6 @@ import
org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -72,7 +71,7 @@ public final class ReadwriteSplittingDistSQLStatementVisitor
extends ReadwriteSp
@Override
public ASTNode visitAlterReadwriteSplittingStorageUnitStatus(final
AlterReadwriteSplittingStorageUnitStatusContext ctx) {
- DatabaseSegment databaseSegment = Objects.nonNull(ctx.databaseName())
? (DatabaseSegment) visit(ctx.databaseName()) : null;
+ DatabaseSegment databaseSegment = null == ctx.databaseName() ? null :
(DatabaseSegment) visit(ctx.databaseName());
String groupName = getIdentifierValue(ctx.groupName());
String status = null == ctx.ENABLE() ?
ctx.DISABLE().getText().toUpperCase() : ctx.ENABLE().getText().toUpperCase();
String storageUnitName = getIdentifierValue(ctx.storageUnitName());
@@ -82,7 +81,7 @@ public final class ReadwriteSplittingDistSQLStatementVisitor
extends ReadwriteSp
@Override
public ASTNode visitShowReadwriteSplittingRules(final
ShowReadwriteSplittingRulesContext ctx) {
return new ShowReadwriteSplittingRulesStatement(null == ctx.ruleName()
? null : getIdentifierValue(ctx.ruleName()),
- Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment)
visit(ctx.databaseName()) : null);
+ null != ctx.databaseName() ? (DatabaseSegment)
visit(ctx.databaseName()) : null);
}
@Override
@@ -104,7 +103,7 @@ public final class
ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSp
@Override
public ASTNode visitShowStatusFromReadwriteSplittingRules(final
ShowStatusFromReadwriteSplittingRulesContext ctx) {
- DatabaseSegment databaseSegment = Objects.nonNull(ctx.databaseName())
? (DatabaseSegment) visit(ctx.databaseName()) : null;
+ DatabaseSegment databaseSegment = null == ctx.databaseName() ? null :
(DatabaseSegment) visit(ctx.databaseName());
String groupName = getIdentifierValue(ctx.groupName());
return new
ShowStatusFromReadwriteSplittingRulesStatement(databaseSegment, groupName);
}
@@ -115,7 +114,7 @@ public final class
ReadwriteSplittingDistSQLStatementVisitor extends ReadwriteSp
@Override
public ASTNode visitCountReadwriteSplittingRule(final
CountReadwriteSplittingRuleContext ctx) {
- return new
CountReadwriteSplittingRuleStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new CountReadwriteSplittingRuleStatement(null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
private Properties getProperties(final PropertiesDefinitionContext ctx) {
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
index 3717a86e333..d9a89f7a7d8 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
@@ -36,7 +36,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
/**
@@ -163,7 +162,7 @@ public final class ShadowRule implements DatabaseRule,
DataSourceContainedRule {
Collection<ColumnShadowAlgorithm<Comparable<?>>> result = new
LinkedList<>();
Map<ShadowOperationType, Collection<ShadowAlgorithmNameRule>>
columnShadowAlgorithmNames =
shadowTableRules.get(tableName).getColumnShadowAlgorithmNames();
Collection<ShadowAlgorithmNameRule> names =
columnShadowAlgorithmNames.get(shadowOperationType);
- if (Objects.isNull(names)) {
+ if (null == names) {
return result;
}
for (ShadowAlgorithmNameRule each : names) {
@@ -185,7 +184,7 @@ public final class ShadowRule implements DatabaseRule,
DataSourceContainedRule {
Collection<String> result = new LinkedList<>();
Map<ShadowOperationType, Collection<ShadowAlgorithmNameRule>>
columnShadowAlgorithmNames =
shadowTableRules.get(tableName).getColumnShadowAlgorithmNames();
Collection<ShadowAlgorithmNameRule> names =
columnShadowAlgorithmNames.get(shadowOperationType);
- if (Objects.isNull(names)) {
+ if (null == names) {
return result;
}
for (ShadowAlgorithmNameRule each : names) {
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
index 7ad800e1340..162d5d23e23 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -66,7 +65,7 @@ public final class ShowDefaultShadowAlgorithmExecutor
implements RQLExecutor<Sho
}
private String convertToString(final Properties props) {
- return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
+ return null == props ? "" : PropertiesConverter.convert(props);
}
@Override
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
index bb36148722a..ff49e9f3d5a 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmExecutor.java
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
@@ -64,7 +63,7 @@ public final class ShowShadowAlgorithmExecutor implements
RQLExecutor<ShowShadow
}
private String convertToString(final Properties props) {
- return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
+ return null != props ? PropertiesConverter.convert(props) : "";
}
@Override
diff --git
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
index 136d437926b..8d4e0adf1e5 100644
---
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
+++
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
@@ -62,7 +62,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -171,7 +170,7 @@ public final class ShadowDistSQLStatementVisitor extends
ShadowDistSQLStatementB
@Override
public ASTNode visitCountShadowRule(final CountShadowRuleContext ctx) {
- return new
CountShadowRuleStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new CountShadowRuleStatement(null == ctx.databaseName() ? null
: (DatabaseSegment) visit(ctx.databaseName()));
}
private Collection<ShadowRuleSegment> autoCreateAlgorithmName(final
Collection<ShadowRuleSegment> shadowRuleSegments) {
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
index 349ed97f36e..7371b178474 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
@@ -402,7 +402,7 @@ public final class ShardingTableRuleStatementChecker {
rules.stream().map(AbstractTableRuleSegment::getKeyGenerateStrategySegment).filter(Objects::nonNull)
.peek(each -> each.getKeyGenerateAlgorithmName()
.filter(optional -> null == currentRuleConfig ||
!currentRuleConfig.getKeyGenerators().containsKey(optional)).ifPresent(notExistKeyGenerator::add))
- .filter(each ->
!each.getKeyGenerateAlgorithmName().isPresent()).filter(each ->
Objects.nonNull(each.getKeyGenerateAlgorithmSegment()))
+ .filter(each ->
!each.getKeyGenerateAlgorithmName().isPresent()).filter(each -> null !=
each.getKeyGenerateAlgorithmSegment())
.forEach(each ->
requiredKeyGenerators.add(each.getKeyGenerateAlgorithmSegment()));
ShardingSpherePreconditions.checkState(notExistKeyGenerator.isEmpty(),
() -> new MissingRequiredAlgorithmException("key generator",
notExistKeyGenerator));
requiredKeyGenerators.forEach(each ->
TypedSPILoader.checkService(KeyGenerateAlgorithm.class, each.getName(),
each.getProps()));
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
index 90e8d44d905..9271eddfb60 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
@@ -59,8 +58,8 @@ public final class ShowShardingAlgorithmExecutor implements
RQLExecutor<ShowShar
return Arrays.asList("name", "type", "props");
}
- private Object buildProps(final Properties props) {
- return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
+ private String buildProps(final Properties props) {
+ return null == props ? "" : PropertiesConverter.convert(props);
}
@Override
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
index 1ac2205f1a1..a142c046e95 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
@@ -39,7 +39,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -60,7 +59,7 @@ public final class ShowShardingTableRuleExecutor implements
RQLExecutor<ShowShar
String tableName = sqlStatement.getTableName();
Iterator<ShardingTableRuleConfiguration> tables;
Iterator<ShardingAutoTableRuleConfiguration> autoTables;
- if (Objects.isNull(tableName)) {
+ if (null == tableName) {
tables = config.getTables().iterator();
autoTables = config.getAutoTables().iterator();
} else {
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
index ffe72843f21..0648765ced4 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
@@ -34,7 +34,6 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
@@ -63,20 +62,20 @@ public final class ShowUnusedShardingAlgorithmsExecutor
implements RQLExecutor<S
private Collection<String> getUsedShardingAlgorithms(final
ShardingRuleConfiguration shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
shardingRuleConfig.getTables().forEach(each -> {
- if (Objects.nonNull(each.getDatabaseShardingStrategy())) {
+ if (null != each.getDatabaseShardingStrategy()) {
result.add(each.getDatabaseShardingStrategy().getShardingAlgorithmName());
}
- if (Objects.nonNull(each.getTableShardingStrategy())) {
+ if (null != each.getTableShardingStrategy()) {
result.add(each.getTableShardingStrategy().getShardingAlgorithmName());
}
});
- shardingRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getShardingStrategy())).forEach(each ->
result.add(each.getShardingStrategy().getShardingAlgorithmName()));
+ shardingRuleConfig.getAutoTables().stream().filter(each -> null !=
each.getShardingStrategy()).forEach(each ->
result.add(each.getShardingStrategy().getShardingAlgorithmName()));
ShardingStrategyConfiguration tableShardingStrategy =
shardingRuleConfig.getDefaultTableShardingStrategy();
- if (Objects.nonNull(tableShardingStrategy) &&
!Strings.isNullOrEmpty(tableShardingStrategy.getShardingAlgorithmName())) {
+ if (null != tableShardingStrategy &&
!Strings.isNullOrEmpty(tableShardingStrategy.getShardingAlgorithmName())) {
result.add(tableShardingStrategy.getShardingAlgorithmName());
}
ShardingStrategyConfiguration databaseShardingStrategy =
shardingRuleConfig.getDefaultDatabaseShardingStrategy();
- if (Objects.nonNull(databaseShardingStrategy) &&
!Strings.isNullOrEmpty(databaseShardingStrategy.getShardingAlgorithmName())) {
+ if (null != databaseShardingStrategy &&
!Strings.isNullOrEmpty(databaseShardingStrategy.getShardingAlgorithmName())) {
result.add(databaseShardingStrategy.getShardingAlgorithmName());
}
return result;
@@ -87,8 +86,8 @@ public final class ShowUnusedShardingAlgorithmsExecutor
implements RQLExecutor<S
return Arrays.asList("name", "type", "props");
}
- private Object buildProps(final Properties props) {
- return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
+ private String buildProps(final Properties props) {
+ return null == props ? "" : PropertiesConverter.convert(props);
}
@Override
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
index 756b6805630..bb56a8a9625 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
/**
@@ -59,10 +58,10 @@ public final class ShowUnusedShardingAuditorsExecutor
implements RQLExecutor<Sho
private Collection<String> getUsedAuditors(final ShardingRuleConfiguration
shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
- shardingRuleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getAuditStrategy())).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
- shardingRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getAuditStrategy())).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
+ shardingRuleConfig.getTables().stream().filter(each -> null !=
each.getAuditStrategy()).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
+ shardingRuleConfig.getAutoTables().stream().filter(each -> null !=
each.getAuditStrategy()).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
ShardingAuditStrategyConfiguration auditStrategy =
shardingRuleConfig.getDefaultAuditStrategy();
- if (Objects.nonNull(auditStrategy) &&
!auditStrategy.getAuditorNames().isEmpty()) {
+ if (null != auditStrategy &&
!auditStrategy.getAuditorNames().isEmpty()) {
result.addAll(auditStrategy.getAuditorNames());
}
return result;
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
index ebbe74a9cd2..cdae93e1448 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
@@ -34,7 +34,6 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
@@ -62,10 +61,10 @@ public final class ShowUnusedShardingKeyGeneratorExecutor
implements RQLExecutor
private Collection<String> getUsedKeyGenerators(final
ShardingRuleConfiguration shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
- shardingRuleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getKeyGenerateStrategy())).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
- shardingRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getKeyGenerateStrategy())).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
+ shardingRuleConfig.getTables().stream().filter(each -> null !=
each.getKeyGenerateStrategy()).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
+ shardingRuleConfig.getAutoTables().stream().filter(each -> null !=
each.getKeyGenerateStrategy()).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
KeyGenerateStrategyConfiguration keyGenerateStrategy =
shardingRuleConfig.getDefaultKeyGenerateStrategy();
- if (Objects.nonNull(keyGenerateStrategy) &&
!Strings.isNullOrEmpty(keyGenerateStrategy.getKeyGeneratorName())) {
+ if (null != keyGenerateStrategy &&
!Strings.isNullOrEmpty(keyGenerateStrategy.getKeyGeneratorName())) {
result.add(keyGenerateStrategy.getKeyGeneratorName());
}
return result;
@@ -76,8 +75,8 @@ public final class ShowUnusedShardingKeyGeneratorExecutor
implements RQLExecutor
return Arrays.asList("name", "type", "props");
}
- private Object buildProps(final Properties props) {
- return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
+ private String buildProps(final Properties props) {
+ return null == props ? "" : PropertiesConverter.convert(props);
}
@Override
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
index 24a64b1cc56..04fd46070b2 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
@@ -28,7 +28,6 @@ import
org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingA
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -71,14 +70,14 @@ public final class DropShardingAlgorithmStatementUpdater
implements RuleDefiniti
private Collection<String> getAllOfAlgorithmsInUsed(final
ShardingRuleConfiguration shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
shardingRuleConfig.getTables().forEach(each -> {
- if (Objects.nonNull(each.getDatabaseShardingStrategy())) {
+ if (null != each.getDatabaseShardingStrategy()) {
result.add(each.getDatabaseShardingStrategy().getShardingAlgorithmName());
}
- if (Objects.nonNull(each.getTableShardingStrategy())) {
+ if (null != each.getTableShardingStrategy()) {
result.add(each.getTableShardingStrategy().getShardingAlgorithmName());
}
});
- shardingRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getShardingStrategy())).forEach(each ->
result.add(each.getShardingStrategy().getShardingAlgorithmName()));
+ shardingRuleConfig.getAutoTables().stream().filter(each -> null !=
each.getShardingStrategy()).forEach(each ->
result.add(each.getShardingStrategy().getShardingAlgorithmName()));
ShardingStrategyConfiguration tableShardingStrategy =
shardingRuleConfig.getDefaultTableShardingStrategy();
if (null != tableShardingStrategy &&
!tableShardingStrategy.getShardingAlgorithmName().isEmpty()) {
result.add(tableShardingStrategy.getShardingAlgorithmName());
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
index 39f30f08de0..a91bdbb4bbe 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java
@@ -29,7 +29,6 @@ import
org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingA
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.LinkedList;
-import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -64,10 +63,10 @@ public final class DropShardingAuditorStatementUpdater
implements RuleDefinition
private Collection<String> getUsedAuditors(final ShardingRuleConfiguration
shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
- shardingRuleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getAuditStrategy())).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
- shardingRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getAuditStrategy())).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
+ shardingRuleConfig.getTables().stream().filter(each -> null !=
each.getAuditStrategy()).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
+ shardingRuleConfig.getAutoTables().stream().filter(each -> null !=
each.getAuditStrategy()).forEach(each ->
result.addAll(each.getAuditStrategy().getAuditorNames()));
ShardingAuditStrategyConfiguration auditStrategy =
shardingRuleConfig.getDefaultAuditStrategy();
- if (Objects.nonNull(auditStrategy) &&
!auditStrategy.getAuditorNames().isEmpty()) {
+ if (null != auditStrategy &&
!auditStrategy.getAuditorNames().isEmpty()) {
result.addAll(auditStrategy.getAuditorNames());
}
return result;
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
index a2ee8600d66..621f61f9e7f 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
@@ -30,7 +30,6 @@ import
org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingK
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.LinkedList;
-import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -66,10 +65,10 @@ public final class DropShardingKeyGeneratorStatementUpdater
implements RuleDefin
private Collection<String> getUsedKeyGenerators(final
ShardingRuleConfiguration shardingRuleConfig) {
Collection<String> result = new LinkedHashSet<>();
- shardingRuleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getKeyGenerateStrategy())).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
- shardingRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getKeyGenerateStrategy())).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
+ shardingRuleConfig.getTables().stream().filter(each -> null !=
each.getKeyGenerateStrategy()).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
+ shardingRuleConfig.getAutoTables().stream().filter(each -> null !=
each.getKeyGenerateStrategy()).forEach(each ->
result.add(each.getKeyGenerateStrategy().getKeyGeneratorName()));
KeyGenerateStrategyConfiguration keyGenerateStrategy =
shardingRuleConfig.getDefaultKeyGenerateStrategy();
- if (Objects.nonNull(keyGenerateStrategy) &&
!Strings.isNullOrEmpty(keyGenerateStrategy.getKeyGeneratorName())) {
+ if (null != keyGenerateStrategy &&
!Strings.isNullOrEmpty(keyGenerateStrategy.getKeyGeneratorName())) {
result.add(keyGenerateStrategy.getKeyGeneratorName());
}
return result;
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
index a389f4b20fb..e75d666d357 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
@@ -124,9 +124,9 @@ public final class DropShardingTableRuleStatementUpdater
implements RuleDefiniti
private void dropUnusedKeyGenerator(final ShardingRuleConfiguration
currentRuleConfig) {
Collection<String> inUsedKeyGenerators =
currentRuleConfig.getTables().stream().map(ShardingTableRuleConfiguration::getKeyGenerateStrategy).filter(Objects::nonNull)
.map(KeyGenerateStrategyConfiguration::getKeyGeneratorName).collect(Collectors.toSet());
-
inUsedKeyGenerators.addAll(currentRuleConfig.getTables().stream().filter(each
-> Objects.nonNull(each.getKeyGenerateStrategy()))
+
inUsedKeyGenerators.addAll(currentRuleConfig.getTables().stream().filter(each
-> null != each.getKeyGenerateStrategy())
.map(each ->
each.getKeyGenerateStrategy().getKeyGeneratorName()).collect(Collectors.toSet()));
-
inUsedKeyGenerators.addAll(currentRuleConfig.getAutoTables().stream().filter(each
-> Objects.nonNull(each.getKeyGenerateStrategy()))
+
inUsedKeyGenerators.addAll(currentRuleConfig.getAutoTables().stream().filter(each
-> null != each.getKeyGenerateStrategy())
.map(each ->
each.getKeyGenerateStrategy().getKeyGeneratorName()).collect(Collectors.toSet()));
if (null != currentRuleConfig.getDefaultKeyGenerateStrategy()) {
inUsedKeyGenerators.add(currentRuleConfig.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
@@ -138,9 +138,9 @@ public final class DropShardingTableRuleStatementUpdater
implements RuleDefiniti
private void dropUnusedAuditor(final ShardingRuleConfiguration
currentRuleConfig) {
Collection<String> inUsedAuditors =
currentRuleConfig.getTables().stream().map(ShardingTableRuleConfiguration::getAuditStrategy).filter(Objects::nonNull)
.flatMap(each ->
each.getAuditorNames().stream()).collect(Collectors.toSet());
-
inUsedAuditors.addAll(currentRuleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getAuditStrategy()))
+
inUsedAuditors.addAll(currentRuleConfig.getTables().stream().filter(each ->
null != each.getAuditStrategy())
.flatMap(each ->
each.getAuditStrategy().getAuditorNames().stream()).collect(Collectors.toSet()));
-
inUsedAuditors.addAll(currentRuleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getAuditStrategy()))
+
inUsedAuditors.addAll(currentRuleConfig.getAutoTables().stream().filter(each ->
null != each.getAuditStrategy())
.flatMap(each ->
each.getAuditStrategy().getAuditorNames().stream()).collect(Collectors.toSet()));
if (null != currentRuleConfig.getDefaultAuditStrategy()) {
inUsedAuditors.addAll(currentRuleConfig.getDefaultAuditStrategy().getAuditorNames());
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/UnusedAlgorithmFinder.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/UnusedAlgorithmFinder.java
index 22473344936..0812bd3f6e6 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/UnusedAlgorithmFinder.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/UnusedAlgorithmFinder.java
@@ -42,11 +42,11 @@ public final class UnusedAlgorithmFinder {
public static Collection<String> find(final ShardingRuleConfiguration
ruleConfig) {
Collection<String> inUsedAlgorithms =
ruleConfig.getTables().stream().map(each ->
Arrays.asList(each.getTableShardingStrategy(),
each.getDatabaseShardingStrategy()))
.flatMap(Collection::stream).filter(Objects::nonNull).map(ShardingStrategyConfiguration::getShardingAlgorithmName).collect(Collectors.toSet());
- inUsedAlgorithms.addAll(ruleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getDatabaseShardingStrategy()))
+ inUsedAlgorithms.addAll(ruleConfig.getTables().stream().filter(each ->
null != each.getDatabaseShardingStrategy())
.map(each ->
each.getDatabaseShardingStrategy().getShardingAlgorithmName()).collect(Collectors.toSet()));
- inUsedAlgorithms.addAll(ruleConfig.getTables().stream().filter(each ->
Objects.nonNull(each.getTableShardingStrategy()))
+ inUsedAlgorithms.addAll(ruleConfig.getTables().stream().filter(each ->
null != each.getTableShardingStrategy())
.map(each ->
each.getTableShardingStrategy().getShardingAlgorithmName()).collect(Collectors.toSet()));
-
inUsedAlgorithms.addAll(ruleConfig.getAutoTables().stream().filter(each ->
Objects.nonNull(each.getShardingStrategy()))
+
inUsedAlgorithms.addAll(ruleConfig.getAutoTables().stream().filter(each -> null
!= each.getShardingStrategy())
.map(each ->
each.getShardingStrategy().getShardingAlgorithmName()).collect(Collectors.toSet()));
if (null != ruleConfig.getDefaultDatabaseShardingStrategy()) {
inUsedAlgorithms.add(ruleConfig.getDefaultDatabaseShardingStrategy().getShardingAlgorithmName());
diff --git
a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
index 87cfbc8dccc..4d20e72d62f 100644
---
a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
+++
b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
@@ -229,7 +229,7 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingAlgorithms(final
ShowShardingAlgorithmsContext ctx) {
- return new
ShowShardingAlgorithmsStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowShardingAlgorithmsStatement(null == ctx.databaseName()
? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -354,7 +354,7 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingKeyGenerators(final
ShowShardingKeyGeneratorsContext ctx) {
- return new
ShowShardingKeyGeneratorsStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowShardingKeyGeneratorsStatement(null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -369,17 +369,17 @@ public final class ShardingDistSQLStatementVisitor
extends ShardingDistSQLStatem
@Override
public ASTNode visitShowShardingAuditors(final ShowShardingAuditorsContext
ctx) {
- return new
ShowShardingAuditorsStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowShardingAuditorsStatement(null == ctx.databaseName() ?
null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowDefaultShardingStrategy(final
ShowDefaultShardingStrategyContext ctx) {
- return new
ShowDefaultShardingStrategyStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowDefaultShardingStrategyStatement(null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowUnusedShardingAlgorithms(final
ShowUnusedShardingAlgorithmsContext ctx) {
- return new
ShowUnusedShardingAlgorithmsStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowUnusedShardingAlgorithmsStatement(null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
private String buildShardingColumn(final
AutoShardingColumnDefinitionContext ctx) {
@@ -394,18 +394,18 @@ public final class ShardingDistSQLStatementVisitor
extends ShardingDistSQLStatem
@Override
public ASTNode visitShowUnusedShardingKeyGenerators(final
ShowUnusedShardingKeyGeneratorsContext ctx) {
- return new
ShowUnusedShardingKeyGeneratorsStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowUnusedShardingKeyGeneratorsStatement(null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowUnusedShardingAuditors(final
ShowUnusedShardingAuditorsContext ctx) {
- return new
ShowUnusedShardingAuditorsStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new ShowUnusedShardingAuditorsStatement(null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
public ASTNode visitShowShardingTableRulesUsedAlgorithm(final
ShowShardingTableRulesUsedAlgorithmContext ctx) {
return new ShowShardingTableRulesUsedAlgorithmStatement(
- getIdentifierValue(ctx.shardingAlgorithmName()),
Objects.nonNull(ctx.databaseName()) ? (DatabaseSegment)
visit(ctx.databaseName()) : null);
+ getIdentifierValue(ctx.shardingAlgorithmName()), null ==
ctx.databaseName() ? null : (DatabaseSegment) visit(ctx.databaseName()));
}
@Override
@@ -420,6 +420,6 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
@Override
public ASTNode visitCountShardingRule(final CountShardingRuleContext ctx) {
- return new
CountShardingRuleStatement(Objects.nonNull(ctx.databaseName()) ?
(DatabaseSegment) visit(ctx.databaseName()) : null);
+ return new CountShardingRuleStatement(null == ctx.databaseName() ?
null : (DatabaseSegment) visit(ctx.databaseName()));
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolPropertiesValidator.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolPropertiesValidator.java
index e361276639e..8976ac96468 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolPropertiesValidator.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/hikari/HikariDataSourcePoolPropertiesValidator.java
@@ -21,7 +21,6 @@ import
org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolPr
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
/**
@@ -99,6 +98,6 @@ public final class HikariDataSourcePoolPropertiesValidator
implements DataSource
}
private boolean checkValueExist(final DataSourceProperties
dataSourceProps, final String key) {
- return dataSourceProps.getAllLocalProperties().containsKey(key) &&
Objects.nonNull(dataSourceProps.getAllLocalProperties().get(key));
+ return dataSourceProps.getAllLocalProperties().containsKey(key) &&
null != dataSourceProps.getAllLocalProperties().get(key);
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
index 42a501ab20c..a5fd69c101c 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
@@ -18,8 +18,6 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.raw;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.session.query.QueryContext;
-import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
@@ -27,11 +25,12 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.
import
org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
+import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
+import org.apache.shardingsphere.infra.session.query.QueryContext;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
-import java.util.Objects;
/**
* Raw executor.
@@ -60,7 +59,7 @@ public final class RawExecutor {
processEngine.executeSQL(executionGroupContext, queryContext);
// TODO Load query header for first query
List<ExecuteResult> results = execute(executionGroupContext,
(RawSQLExecutorCallback) null, callback);
- return results.isEmpty() || Objects.isNull(results.get(0)) ?
Collections.singletonList(new UpdateResult(0, 0L)) : results;
+ return results.isEmpty() || null == results.get(0) ?
Collections.singletonList(new UpdateResult(0, 0L)) : results;
} finally {
processEngine.completeSQLExecution();
}
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/OwnerToken.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/OwnerToken.java
index fbef25e61d2..fb9ca932487 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/OwnerToken.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/OwnerToken.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Substitutable;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue;
-import java.util.Objects;
import java.util.Set;
/**
@@ -49,7 +48,7 @@ public final class OwnerToken extends SQLToken implements
Substitutable, RouteUn
@Override
public String toString(final RouteUnit routeUnit) {
- if (Objects.nonNull(ownerName) &&
!Strings.isNullOrEmpty(ownerName.getValue()) &&
tableName.getValue().equals(ownerName.getValue())) {
+ if (null != ownerName && !Strings.isNullOrEmpty(ownerName.getValue())
&& tableName.getValue().equals(ownerName.getValue())) {
Set<String> actualTableNames =
routeUnit.getActualTableNames(tableName.getValue());
String actualTableName = actualTableNames.isEmpty() ?
tableName.getValue().toLowerCase() : actualTableNames.iterator().next();
return tableName.getQuoteCharacter().wrap(actualTableName) + ".";
@@ -59,6 +58,6 @@ public final class OwnerToken extends SQLToken implements
Substitutable, RouteUn
@Override
public String toString() {
- return Objects.isNull(ownerName) ||
Strings.isNullOrEmpty(ownerName.getValue()) ? "" :
ownerName.getValueWithQuoteCharacters() + ".";
+ return null == ownerName ||
Strings.isNullOrEmpty(ownerName.getValue()) ? "" :
ownerName.getValueWithQuoteCharacters() + ".";
}
}
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlUserSwapper.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlUserSwapper.java
index 6813063a4d9..add465e9386 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlUserSwapper.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlUserSwapper.java
@@ -24,8 +24,6 @@ import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
-import java.util.Objects;
-
/**
* YAML user swapper.
*/
@@ -33,7 +31,7 @@ public final class YamlUserSwapper implements
YamlConfigurationSwapper<YamlUserC
@Override
public YamlUserConfiguration swapToYamlConfiguration(final
ShardingSphereUser data) {
- if (Objects.isNull(data)) {
+ if (null == data) {
return null;
}
YamlUserConfiguration result = new YamlUserConfiguration();
@@ -45,7 +43,7 @@ public final class YamlUserSwapper implements
YamlConfigurationSwapper<YamlUserC
@Override
public ShardingSphereUser swapToObject(final YamlUserConfiguration
yamlConfig) {
- if (Objects.isNull(yamlConfig)) {
+ if (null == yamlConfig) {
return null;
}
Grantee grantee = convertYamlUserToGrantee(yamlConfig.getUser());
diff --git
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java
index 60fee076591..e736c88b384 100644
---
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java
+++
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/rule/builder/DefaultLoggingRuleConfigurationBuilder.java
@@ -51,14 +51,14 @@ public final class DefaultLoggingRuleConfigurationBuilder
implements DefaultGlob
}
private Collection<ShardingSphereLogger> getDefaultLoggers(final
LoggerContext loggerContext) {
- return loggerContext.getLoggerList().stream().filter(each ->
Objects.nonNull(each.getLevel())).filter(each ->
!Logger.ROOT_LOGGER_NAME.equalsIgnoreCase(each.getName()))
+ return loggerContext.getLoggerList().stream().filter(each -> null !=
each.getLevel()).filter(each ->
!Logger.ROOT_LOGGER_NAME.equalsIgnoreCase(each.getName()))
.map(each -> new ShardingSphereLogger(each.getName(),
each.getLevel().levelStr, each.isAdditive(),
each.iteratorForAppenders().hasNext() ?
each.iteratorForAppenders().next().getName() : null))
.collect(Collectors.toList());
}
private Collection<ShardingSphereAppender> getDefaultAppenders(final
LoggerContext loggerContext) {
- return loggerContext.getLoggerList().stream().filter(each ->
Objects.nonNull(each.getLevel())).filter(each ->
!Logger.ROOT_LOGGER_NAME.equalsIgnoreCase(each.getName())).map(each -> {
+ return loggerContext.getLoggerList().stream().filter(each -> null !=
each.getLevel()).filter(each ->
!Logger.ROOT_LOGGER_NAME.equalsIgnoreCase(each.getName())).map(each -> {
Iterator<Appender<ILoggingEvent>> appenderIterator =
each.iteratorForAppenders();
if (appenderIterator.hasNext()) {
Appender<ILoggingEvent> appender = appenderIterator.next();
diff --git
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlAppenderSwapper.java
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlAppenderSwapper.java
index ac844a21724..48b18dd9d5f 100644
---
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlAppenderSwapper.java
+++
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlAppenderSwapper.java
@@ -21,8 +21,6 @@ import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwappe
import org.apache.shardingsphere.logging.logger.ShardingSphereAppender;
import org.apache.shardingsphere.logging.yaml.config.YamlAppenderConfiguration;
-import java.util.Objects;
-
/**
* YAML appender swapper.
*/
@@ -30,7 +28,7 @@ public final class YamlAppenderSwapper implements
YamlConfigurationSwapper<YamlA
@Override
public YamlAppenderConfiguration swapToYamlConfiguration(final
ShardingSphereAppender data) {
- if (Objects.isNull(data)) {
+ if (null == data) {
return null;
}
YamlAppenderConfiguration result = new YamlAppenderConfiguration();
@@ -43,7 +41,7 @@ public final class YamlAppenderSwapper implements
YamlConfigurationSwapper<YamlA
@Override
public ShardingSphereAppender swapToObject(final YamlAppenderConfiguration
yamlConfig) {
- if (Objects.isNull(yamlConfig)) {
+ if (null == yamlConfig) {
return null;
}
ShardingSphereAppender result = new
ShardingSphereAppender(yamlConfig.getAppenderName(),
yamlConfig.getAppenderClass(), yamlConfig.getPattern());
diff --git
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlLoggerSwapper.java
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlLoggerSwapper.java
index cc027618cab..3f566720a8b 100644
---
a/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlLoggerSwapper.java
+++
b/kernel/logging/core/src/main/java/org/apache/shardingsphere/logging/yaml/swapper/YamlLoggerSwapper.java
@@ -17,11 +17,9 @@
package org.apache.shardingsphere.logging.yaml.swapper;
+import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
import org.apache.shardingsphere.logging.logger.ShardingSphereLogger;
import org.apache.shardingsphere.logging.yaml.config.YamlLoggerConfiguration;
-import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
-
-import java.util.Objects;
/**
* YAML logger swapper.
@@ -30,7 +28,7 @@ public final class YamlLoggerSwapper implements
YamlConfigurationSwapper<YamlLog
@Override
public YamlLoggerConfiguration swapToYamlConfiguration(final
ShardingSphereLogger data) {
- if (Objects.isNull(data)) {
+ if (null == data) {
return null;
}
YamlLoggerConfiguration result = new YamlLoggerConfiguration();
@@ -44,7 +42,7 @@ public final class YamlLoggerSwapper implements
YamlConfigurationSwapper<YamlLog
@Override
public ShardingSphereLogger swapToObject(final YamlLoggerConfiguration
yamlConfig) {
- if (Objects.isNull(yamlConfig)) {
+ if (null == yamlConfig) {
return null;
}
ShardingSphereLogger result = new
ShardingSphereLogger(yamlConfig.getLoggerName(), yamlConfig.getLevel(),
yamlConfig.getAdditivity(), yamlConfig.getAppenderName());
diff --git
a/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
b/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
index 76c3ca3a6ca..862ee34a6af 100644
---
a/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
+++
b/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
@@ -35,7 +35,6 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import java.util.Objects;
import java.util.concurrent.ConcurrentMap;
/**
@@ -61,14 +60,14 @@ public final class NarayanaXATransactionManagerProvider
implements XATransaction
@Override
public void registerRecoveryResource(final String dataSourceName, final
XADataSource xaDataSource) {
- if (Objects.nonNull(xaRecoveryModule)) {
+ if (null != xaRecoveryModule) {
xaRecoveryModule.addXAResourceRecoveryHelper(new
DataSourceXAResourceRecoveryHelper(xaDataSource));
}
}
@Override
public void removeRecoveryResource(final String dataSourceName, final
XADataSource xaDataSource) {
- if (Objects.nonNull(xaRecoveryModule)) {
+ if (null != xaRecoveryModule) {
xaRecoveryModule.removeXAResourceRecoveryHelper(new
DataSourceXAResourceRecoveryHelper(xaDataSource));
}
}
diff --git
a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
index 21fd0973f8f..cff92a28413 100644
---
a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
+++
b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
@@ -337,7 +337,7 @@ public final class NacosRepository implements
ClusterPersistRepository {
keyValues.removeIf(keyValue -> {
Collection<Instance> instances =
instanceMap.get(keyValue.getKey());
String value = keyValue.getValue();
- return CollectionUtils.isNotEmpty(instances) ?
instances.stream().anyMatch(instance ->
StringUtils.equals(NacosMetaDataUtils.getValue(instance), value)) :
Objects.isNull(value);
+ return CollectionUtils.isNotEmpty(instances) ?
instances.stream().anyMatch(instance ->
StringUtils.equals(NacosMetaDataUtils.getValue(instance), value)) : null ==
value;
});
}
return keyValues.isEmpty();
diff --git
a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
index 02d24a9a925..855f398ab51 100644
---
a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
+++
b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/listener/NamingEventListener.java
@@ -31,7 +31,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -92,13 +91,13 @@ public final class NamingEventListener implements
EventListener {
}
private Type getEventChangedType(final Instance preInstance, final
Instance instance) {
- if (Objects.isNull(preInstance) && Objects.nonNull(instance)) {
+ if (null == preInstance && null != instance) {
return DataChangedEvent.Type.ADDED;
}
- if (Objects.nonNull(preInstance) && Objects.nonNull(instance) &&
NacosMetaDataUtils.getTimestamp(preInstance) !=
NacosMetaDataUtils.getTimestamp(instance)) {
+ if (null != preInstance && null != instance &&
NacosMetaDataUtils.getTimestamp(preInstance) !=
NacosMetaDataUtils.getTimestamp(instance)) {
return DataChangedEvent.Type.UPDATED;
}
- if (Objects.nonNull(preInstance) && Objects.isNull(instance)) {
+ if (null != preInstance && null == instance) {
return DataChangedEvent.Type.DELETED;
}
return DataChangedEvent.Type.IGNORED;
diff --git
a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
index 4989df37478..5b46a6a27ec 100644
---
a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
+++
b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
@@ -50,7 +50,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -350,7 +349,7 @@ class NacosRepositoryTest {
private VoidAnswer2<String, EventListener> getListenerAnswer(final
Instance preInstance, final Event event) {
return (serviceName, listener) -> {
MemberAccessor accessor = Plugins.getMemberAccessor();
- if (Objects.nonNull(preInstance)) {
+ if (null != preInstance) {
Map<String, Instance> preInstances = new HashMap<>();
preInstances.put(NacosMetaDataUtils.getKey(preInstance),
preInstance);
accessor.set(listener.getClass().getDeclaredField("preInstances"), listener,
preInstances);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
index 951610651be..8396ee3f211 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
@@ -39,7 +39,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
/**
* Export storage nodes executor.
@@ -66,12 +65,12 @@ public final class ExportStorageNodesExecutor implements
MetaDataRequiredQueryab
}
private void checkSQLStatement(final ShardingSphereMetaData metaData,
final ExportStorageNodesStatement sqlStatement) {
-
ShardingSpherePreconditions.checkState(Objects.isNull(sqlStatement.getDatabaseName())
|| null != metaData.getDatabase(sqlStatement.getDatabaseName()),
+ ShardingSpherePreconditions.checkState(null ==
sqlStatement.getDatabaseName() || null !=
metaData.getDatabase(sqlStatement.getDatabaseName()),
() -> new IllegalArgumentException(String.format("database %s
is not existed", sqlStatement.getDatabaseName())));
}
private String generateExportData(final ShardingSphereMetaData metaData,
final ExportStorageNodesStatement sqlStatement) {
- return JsonUtils.toJsonString(new
ExportedStorageNodes(Objects.isNull(sqlStatement.getDatabaseName()) ?
getAllStorageNodes(metaData)
+ return JsonUtils.toJsonString(new ExportedStorageNodes(null ==
sqlStatement.getDatabaseName() ? getAllStorageNodes(metaData)
:
generateDatabaseExportStorageNodesData(metaData.getDatabase(sqlStatement.getDatabaseName()))));
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
index 67f3592f94b..06e30488697 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java
@@ -38,7 +38,6 @@ import java.io.IOException;
import java.nio.charset.Charset;
import java.sql.SQLException;
import java.util.Collection;
-import java.util.Objects;
/**
* Import meta data updater.
@@ -70,7 +69,7 @@ public final class ImportMetaDataUpdater implements
RALUpdater<ImportMetaDataSta
private void importServerConfig(final ExportedMetaData exportedMetaData) {
YamlProxyServerConfiguration yamlServerConfig =
YamlEngine.unmarshal(exportedMetaData.getRules() + System.lineSeparator() +
exportedMetaData.getProps(), YamlProxyServerConfiguration.class);
- if (Objects.isNull(yamlServerConfig)) {
+ if (null == yamlServerConfig) {
return;
}
Collection<RuleConfiguration> rules =
ruleConfigSwapperEngine.swapToRuleConfigurations(yamlServerConfig.getRules());
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
index a2836ab319a..fc9e63b9c3e 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
@@ -20,12 +20,12 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
import com.google.common.base.Strings;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
+import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlPersistRepositoryConfiguration;
-import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.EmbeddedITContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
@@ -34,7 +34,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.sql.SQLException;
-import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -60,7 +59,7 @@ public final class ShardingSphereJdbcContainer implements
EmbeddedITContainer, A
@Override
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
- if (Objects.isNull(dataSource)) {
+ if (null == dataSource) {
if (Strings.isNullOrEmpty(serverLists)) {
try {
targetDataSourceProvider.set(
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index cc423df3350..97d794b3076 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -29,7 +29,6 @@ import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
import java.sql.DriverManager;
-import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -78,7 +77,7 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
@Override
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
- if (Objects.isNull(dataSource)) {
+ if (null == dataSource) {
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()),
ProxyContainerConstants.USERNAME,
ProxyContainerConstants.PASSWORD));
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index 0cf5b21e246..ad955e10cc5 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -19,18 +19,17 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
import java.sql.DriverManager;
-import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -80,7 +79,7 @@ public final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
@Override
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
- if (Objects.isNull(dataSource)) {
+ if (null == dataSource) {
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()),
ProxyContainerConstants.USERNAME,
ProxyContainerConstants.PASSWORD));
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/jdbc/ShardingSphereJDBCContainer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/jdbc/ShardingSphereJDBCContainer.java
index e2388050674..21a0f3621f1 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/jdbc/ShardingSphereJDBCContainer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/jdbc/ShardingSphereJDBCContainer.java
@@ -25,7 +25,6 @@ import javax.sql.DataSource;
import java.io.File;
import java.io.IOException;
import java.sql.SQLException;
-import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -56,7 +55,7 @@ public final class ShardingSphereJDBCContainer implements
EmbeddedITContainer {
*/
public DataSource getTargetDataSource() {
DataSource dataSource = targetDataSourceProvider.get();
- if (Objects.isNull(dataSource)) {
+ if (null == dataSource) {
try {
targetDataSourceProvider.set(
YamlShardingSphereDataSourceFactory.createDataSource(databaseContainer.getActualDataSourceMap(),
new File(ruleConfigPath)));
