You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/05/21 07:00:28 UTC
[shardingsphere] branch master updated: Fix sonar issues on Use "==" to perform this enum comparison instead of using "equals" (#25817)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 c3929b1af3a Fix sonar issues on Use "==" to perform this enum comparison instead of using "equals" (#25817)
c3929b1af3a is described below
commit c3929b1af3aec701af983194ed6e95df75cce2c2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun May 21 15:00:21 2023 +0800
Fix sonar issues on Use "==" to perform this enum comparison instead of using "equals" (#25817)
---
.../rewrite/token/generator/EncryptProjectionTokenGenerator.java | 6 +++---
.../shardingsphere/sharding/merge/dql/orderby/CompareUtils.java | 4 ++--
.../rewrite/token/generator/impl/ProjectionsTokenGenerator.java | 4 ++--
.../sharding/rewrite/token/pojo/FetchDirectionToken.java | 4 ++--
.../sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java | 4 ++--
.../shardingsphere/infra/state/instance/InstanceStateContext.java | 2 +-
.../globalclock/core/executor/GlobalClockTransactionHook.java | 2 +-
.../converter/segment/orderby/item/ColumnOrderByItemConverter.java | 4 ++--
.../segment/orderby/item/ExpressionOrderByItemConverter.java | 2 +-
.../converter/segment/orderby/item/IndexOrderByItemConverter.java | 4 ++--
.../handler/update/AlterTransactionRuleStatementUpdater.java | 6 +++---
.../sql/common/segment/dml/order/item/OrderByItemSegment.java | 4 ++--
.../sql/parser/sql/common/value/identifier/IdentifierValue.java | 2 +-
13 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
index 05583e2fa78..36dc2793e1a 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
@@ -147,11 +147,11 @@ public final class EncryptProjectionTokenGenerator implements CollectionSQLToken
private Collection<ColumnProjection> generateProjections(final String tableName, final ColumnProjection column, final SubqueryType subqueryType, final boolean shorthand,
final ShorthandProjectionSegment segment) {
Collection<ColumnProjection> result = new LinkedList<>();
- if (SubqueryType.PREDICATE_SUBQUERY.equals(subqueryType)) {
+ if (SubqueryType.PREDICATE_SUBQUERY == subqueryType) {
result.add(distinctOwner(generatePredicateSubqueryProjection(tableName, column), shorthand));
- } else if (SubqueryType.TABLE_SUBQUERY.equals(subqueryType)) {
+ } else if (SubqueryType.TABLE_SUBQUERY == subqueryType) {
result.addAll(generateTableSubqueryProjections(tableName, column, shorthand));
- } else if (SubqueryType.EXISTS_SUBQUERY.equals(subqueryType)) {
+ } else if (SubqueryType.EXISTS_SUBQUERY == subqueryType) {
result.addAll(generateExistsSubqueryProjections(tableName, column, shorthand));
} else {
result.add(distinctOwner(generateCommonProjection(tableName, column, segment), shorthand));
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/CompareUtils.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/CompareUtils.java
index 3c3502f92ab..88842f63d1c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/CompareUtils.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/CompareUtils.java
@@ -45,10 +45,10 @@ public final class CompareUtils {
return 0;
}
if (null == thisValue) {
- return NullsOrderType.FIRST.equals(nullsOrderType) ? -1 : 1;
+ return NullsOrderType.FIRST == nullsOrderType ? -1 : 1;
}
if (null == otherValue) {
- return NullsOrderType.FIRST.equals(nullsOrderType) ? 1 : -1;
+ return NullsOrderType.FIRST == nullsOrderType ? 1 : -1;
}
if (!caseSensitive && thisValue instanceof String && otherValue instanceof String) {
return compareToCaseInsensitiveString((String) thisValue, (String) otherValue, orderDirection);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
index 918fc153650..d9edcd7cb5f 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
@@ -141,8 +141,8 @@ public final class ProjectionsTokenGenerator implements OptionalSQLTokenGenerato
private NullsOrderType generateNewNullsOrderType(final DatabaseType databaseType, final OrderDirection orderDirection) {
if (databaseType instanceof SchemaSupportedDatabaseType || databaseType instanceof OracleDatabaseType) {
- return OrderDirection.ASC.equals(orderDirection) ? NullsOrderType.LAST : NullsOrderType.FIRST;
+ return OrderDirection.ASC == orderDirection ? NullsOrderType.LAST : NullsOrderType.FIRST;
}
- return OrderDirection.ASC.equals(orderDirection) ? NullsOrderType.FIRST : NullsOrderType.LAST;
+ return OrderDirection.ASC == orderDirection ? NullsOrderType.FIRST : NullsOrderType.LAST;
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/FetchDirectionToken.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/FetchDirectionToken.java
index 134be29de29..f7ecbc529c6 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/FetchDirectionToken.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/FetchDirectionToken.java
@@ -58,10 +58,10 @@ public final class FetchDirectionToken extends SQLToken implements Substitutable
if (DirectionType.isBackwardCountDirectionType(directionType)) {
return " BACKWARD " + actualFetchCount + " ";
}
- if (DirectionType.ABSOLUTE_COUNT.equals(directionType)) {
+ if (DirectionType.ABSOLUTE_COUNT == directionType) {
return " ABSOLUTE " + actualFetchCount + " ";
}
- if (DirectionType.RELATIVE_COUNT.equals(directionType)) {
+ if (DirectionType.RELATIVE_COUNT == directionType) {
return " RELATIVE " + actualFetchCount + " ";
}
return directionType.getName();
diff --git a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
index c667c6391ee..f9b24cb53ca 100644
--- a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
+++ b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
@@ -109,9 +109,9 @@ public abstract class AbstractCosIdIntervalShardingAlgorithm<T extends Comparabl
}
if (shardingValue.hasLowerBound()) {
LocalDateTime lower = localDateTimeConvertor.toLocalDateTime(shardingValue.lowerEndpoint());
- return BoundType.OPEN.equals(shardingValue.lowerBoundType()) ? Range.greaterThan(lower) : Range.atLeast(lower);
+ return BoundType.OPEN == shardingValue.lowerBoundType() ? Range.greaterThan(lower) : Range.atLeast(lower);
}
LocalDateTime upper = localDateTimeConvertor.toLocalDateTime(shardingValue.upperEndpoint());
- return BoundType.OPEN.equals(shardingValue.upperBoundType()) ? Range.lessThan(upper) : Range.atMost(upper);
+ return BoundType.OPEN == shardingValue.upperBoundType() ? Range.lessThan(upper) : Range.atMost(upper);
}
}
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/state/instance/InstanceStateContext.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/instance/InstanceStateContext.java
index 0e7fb863d96..6b53f54e147 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/state/instance/InstanceStateContext.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/instance/InstanceStateContext.java
@@ -39,7 +39,7 @@ public final class InstanceStateContext {
if (on) {
currentState.push(state);
} else {
- if (getCurrentState().equals(state)) {
+ if (getCurrentState() == state) {
recoverState();
}
}
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java
index 7f034cb6916..6acd91467a5 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java
@@ -75,7 +75,7 @@ public final class GlobalClockTransactionHook extends TransactionHookAdapter {
if (!enabled) {
return;
}
- if (null == isolationLevel || TransactionIsolationLevel.READ_COMMITTED.equals(isolationLevel)) {
+ if (null == isolationLevel || TransactionIsolationLevel.READ_COMMITTED == isolationLevel) {
globalClockTransactionExecutor.sendSnapshotTimestamp(connections, globalClockProvider.getCurrentTimestamp());
}
}
diff --git a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ColumnOrderByItemConverter.java b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ColumnOrderByItemConverter.java
index 257b689ddb0..239b7a167f1 100644
--- a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ColumnOrderByItemConverter.java
+++ b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ColumnOrderByItemConverter.java
@@ -42,11 +42,11 @@ public final class ColumnOrderByItemConverter implements SQLSegmentConverter<Col
if (!result.isPresent()) {
return Optional.empty();
}
- if (OrderDirection.DESC.equals(segment.getOrderDirection())) {
+ if (OrderDirection.DESC == segment.getOrderDirection()) {
result = Optional.of(new SqlBasicCall(SqlStdOperatorTable.DESC, Collections.singletonList(result.get()), SqlParserPos.ZERO));
}
if (segment.getNullsOrderType().isPresent()) {
- SqlPostfixOperator nullsOrderType = NullsOrderType.FIRST.equals(segment.getNullsOrderType().get()) ? SqlStdOperatorTable.NULLS_FIRST : SqlStdOperatorTable.NULLS_LAST;
+ SqlPostfixOperator nullsOrderType = NullsOrderType.FIRST == segment.getNullsOrderType().get() ? SqlStdOperatorTable.NULLS_FIRST : SqlStdOperatorTable.NULLS_LAST;
result = Optional.of(new SqlBasicCall(nullsOrderType, Collections.singletonList(result.get()), SqlParserPos.ZERO));
}
return result;
diff --git a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ExpressionOrderByItemConverter.java b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ExpressionOrderByItemConverter.java
index d6d3b4b00e4..ace41f81c71 100644
--- a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ExpressionOrderByItemConverter.java
+++ b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/ExpressionOrderByItemConverter.java
@@ -42,7 +42,7 @@ public final class ExpressionOrderByItemConverter implements SQLSegmentConverter
return Optional.empty();
}
if (segment.getNullsOrderType().isPresent()) {
- SqlPostfixOperator nullsOrderType = NullsOrderType.FIRST.equals(segment.getNullsOrderType().get()) ? SqlStdOperatorTable.NULLS_FIRST : SqlStdOperatorTable.NULLS_LAST;
+ SqlPostfixOperator nullsOrderType = NullsOrderType.FIRST == segment.getNullsOrderType().get() ? SqlStdOperatorTable.NULLS_FIRST : SqlStdOperatorTable.NULLS_LAST;
result = Optional.of(new SqlBasicCall(nullsOrderType, Collections.singletonList(result.get()), SqlParserPos.ZERO));
}
return result;
diff --git a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/IndexOrderByItemConverter.java b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/IndexOrderByItemConverter.java
index f47232b1c60..a1a0d6b7260 100644
--- a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/IndexOrderByItemConverter.java
+++ b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/orderby/item/IndexOrderByItemConverter.java
@@ -39,11 +39,11 @@ public final class IndexOrderByItemConverter implements SQLSegmentConverter<Inde
@Override
public Optional<SqlNode> convert(final IndexOrderByItemSegment segment) {
SqlNode result = SqlLiteral.createExactNumeric(String.valueOf(segment.getColumnIndex()), SqlParserPos.ZERO);
- if (OrderDirection.DESC.equals(segment.getOrderDirection())) {
+ if (OrderDirection.DESC == segment.getOrderDirection()) {
result = new SqlBasicCall(SqlStdOperatorTable.DESC, Collections.singletonList(result), SqlParserPos.ZERO);
}
if (segment.getNullsOrderType().isPresent()) {
- SqlPostfixOperator nullsOrderType = NullsOrderType.FIRST.equals(segment.getNullsOrderType().get()) ? SqlStdOperatorTable.NULLS_FIRST : SqlStdOperatorTable.NULLS_LAST;
+ SqlPostfixOperator nullsOrderType = NullsOrderType.FIRST == segment.getNullsOrderType().get() ? SqlStdOperatorTable.NULLS_FIRST : SqlStdOperatorTable.NULLS_LAST;
result = new SqlBasicCall(nullsOrderType, Collections.singletonList(result), SqlParserPos.ZERO);
}
return Optional.of(result);
diff --git a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
index 5875a4982c1..98eeb712628 100644
--- a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
+++ b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
@@ -38,7 +38,7 @@ public final class AlterTransactionRuleStatementUpdater implements GlobalRuleRAL
public void checkSQLStatement(final TransactionRuleConfiguration currentRuleConfig, final AlterTransactionRuleStatement sqlStatement) {
checkTransactionType(sqlStatement);
TransactionType transactionType = TransactionType.valueOf(sqlStatement.getDefaultType().toUpperCase());
- if (TransactionType.LOCAL.equals(transactionType)) {
+ if (TransactionType.LOCAL == transactionType) {
return;
}
checkTransactionManager(sqlStatement, transactionType);
@@ -55,10 +55,10 @@ public final class AlterTransactionRuleStatementUpdater implements GlobalRuleRAL
private void checkTransactionManager(final AlterTransactionRuleStatement statement, final TransactionType transactionType) {
Collection<ShardingSphereTransactionManager> transactionManagers = ShardingSphereServiceLoader.getServiceInstances(ShardingSphereTransactionManager.class);
- Optional<ShardingSphereTransactionManager> transactionManager = transactionManagers.stream().filter(each -> transactionType.equals(each.getTransactionType())).findFirst();
+ Optional<ShardingSphereTransactionManager> transactionManager = transactionManagers.stream().filter(each -> transactionType == each.getTransactionType()).findFirst();
ShardingSpherePreconditions.checkState(transactionManager.isPresent(),
() -> new InvalidRuleConfigurationException("Transaction", String.format("No transaction manager with type `%s`", statement.getDefaultType())));
- if (TransactionType.XA.equals(transactionType)) {
+ if (TransactionType.XA == transactionType) {
checkTransactionManagerProviderType(transactionManager.get(), statement.getProvider().getProviderType());
}
}
diff --git a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/order/item/OrderByItemSegment.java b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/order/item/OrderByItemSegment.java
index 56cd7a022a9..e6015a80d4b 100644
--- a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/order/item/OrderByItemSegment.java
+++ b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/order/item/OrderByItemSegment.java
@@ -60,8 +60,8 @@ public abstract class OrderByItemSegment implements SQLSegment {
return nullsOrderType;
}
if ("PostgreSQL".equals(databaseType) || "openGauss".equals(databaseType) || "Oracle".equals(databaseType)) {
- return OrderDirection.ASC.equals(orderDirection) ? NullsOrderType.LAST : NullsOrderType.FIRST;
+ return OrderDirection.ASC == orderDirection ? NullsOrderType.LAST : NullsOrderType.FIRST;
}
- return OrderDirection.ASC.equals(orderDirection) ? NullsOrderType.FIRST : NullsOrderType.LAST;
+ return OrderDirection.ASC == orderDirection ? NullsOrderType.FIRST : NullsOrderType.LAST;
}
}
diff --git a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/value/identifier/IdentifierValue.java b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/value/identifier/IdentifierValue.java
index 5d1098efde8..b49c611ed96 100644
--- a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/value/identifier/IdentifierValue.java
+++ b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/value/identifier/IdentifierValue.java
@@ -65,7 +65,7 @@ public final class IdentifierValue implements ValueASTNode<String> {
return text;
}
QuoteCharacter quoteCharacter = QuoteCharacter.getQuoteCharacter(text);
- if (quoteCharacter.equals(QuoteCharacter.NONE)) {
+ if (QuoteCharacter.NONE == quoteCharacter) {
return text.trim();
}
return text.substring(1, text.length() - 1);