This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 cbdd8d404d2 Fix pmd check for UselessParentheses (#25216)
cbdd8d404d2 is described below
commit cbdd8d404d2d531262524e208014432daa1abc23
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Apr 18 21:34:09 2023 +0800
Fix pmd check for UselessParentheses (#25216)
---
.../db/protocol/mysql/codec/MySQLPacketCodecEngine.java | 2 +-
.../binlog/row/column/value/integer/MySQLBitBinlogProtocolValue.java | 2 +-
.../rewrite/token/generator/EncryptProjectionTokenGenerator.java | 2 +-
.../rewrite/token/generator/InsertCipherNameTokenGenerator.java | 2 +-
.../token/generator/impl/ShardingInsertValuesTokenGenerator.java | 2 +-
.../metadata/database/schema/loader/datatype/DataTypeLoader.java | 2 +-
.../shardingsphere/infra/rewrite/context/SQLRewriteContext.java | 2 +-
.../data/pipeline/cdc/util/ColumnValueConvertUtils.java | 2 +-
.../shardingsphere/data/pipeline/core/importer/DataRecordMerger.java | 5 ++++-
.../data/pipeline/core/importer/DataSourceImporter.java | 2 +-
.../pipeline/mysql/ingest/client/netty/MySQLNegotiateHandler.java | 2 +-
.../sqlfederation/advanced/resultset/SQLFederationResultSet.java | 2 +-
.../registry/metadata/watcher/MetaDataChangedWatcher.java | 2 +-
.../mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java | 2 +-
14 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
index 18f802355aa..905238bfa81 100644
---
a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
+++
b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
@@ -116,7 +116,7 @@ public final class MySQLPacketCodecEngine implements
DatabasePacketCodecEngine<M
}
private void writeMultiPackets(final ChannelHandlerContext context, final
ByteBuf byteBuf) {
- int packetCount = (byteBuf.skipBytes(PAYLOAD_LENGTH +
SEQUENCE_LENGTH).readableBytes() / MAX_PACKET_LENGTH) + 1;
+ int packetCount = byteBuf.skipBytes(PAYLOAD_LENGTH +
SEQUENCE_LENGTH).readableBytes() / MAX_PACKET_LENGTH + 1;
CompositeByteBuf result = context.alloc().compositeBuffer(packetCount
* 2);
AtomicInteger sequenceId =
context.channel().attr(MySQLConstants.MYSQL_SEQUENCE_ID).get();
for (int i = 0; i < packetCount; i++) {
diff --git
a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/integer/MySQLBitBinlogProtocolValue.java
b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/integer/MySQLBitBinlogProtocolValue.java
index 1e2b44627df..93b369de7ad 100644
---
a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/integer/MySQLBitBinlogProtocolValue.java
+++
b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/binlog/row/column/value/integer/MySQLBitBinlogProtocolValue.java
@@ -34,7 +34,7 @@ public final class MySQLBitBinlogProtocolValue implements
MySQLBinlogProtocolVal
}
private int getLength(final int meta) {
- int nbits = ((meta >> 8) * 8) + (meta & 0xff);
+ int nbits = (meta >> 8) * 8 + (meta & 0xff);
return (nbits + 7) / 8;
}
}
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 5d877716270..ed095f40082 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
@@ -200,7 +200,7 @@ public final class EncryptProjectionTokenGenerator
implements CollectionSQLToken
private ColumnProjection generateCommonProjection(final String tableName,
final ColumnProjection column, final ShorthandProjectionSegment segment) {
String encryptColumnName = getEncryptColumnName(tableName,
column.getName());
- String owner = (null == segment || !segment.getOwner().isPresent()) ?
column.getOwner() : segment.getOwner().get().getIdentifier().getValue();
+ String owner = null == segment || !segment.getOwner().isPresent() ?
column.getOwner() : segment.getOwner().get().getIdentifier().getValue();
return new ColumnProjection(owner, encryptColumnName,
column.getAlias().orElse(column.getName()));
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
index 62d72c4ab51..e9785491da6 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/InsertCipherNameTokenGenerator.java
@@ -48,7 +48,7 @@ public final class InsertCipherNameTokenGenerator implements
CollectionSQLTokenG
if (!(sqlStatementContext instanceof InsertStatementContext)) {
return false;
}
- Optional<InsertColumnsSegment> insertColumnsSegment =
(((InsertStatementContext)
sqlStatementContext).getSqlStatement()).getInsertColumns();
+ Optional<InsertColumnsSegment> insertColumnsSegment =
((InsertStatementContext)
sqlStatementContext).getSqlStatement().getInsertColumns();
return insertColumnsSegment.isPresent() &&
!insertColumnsSegment.get().getColumns().isEmpty();
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
index 4bbf667ee92..ae3f5067597 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingInsertValuesTokenGenerator.java
@@ -51,7 +51,7 @@ public final class ShardingInsertValuesTokenGenerator
implements OptionalSQLToke
@Override
public InsertValuesToken generateSQLToken(final InsertStatementContext
insertStatementContext) {
- Collection<InsertValuesSegment> insertValuesSegments =
(insertStatementContext.getSqlStatement()).getValues();
+ Collection<InsertValuesSegment> insertValuesSegments =
insertStatementContext.getSqlStatement().getValues();
InsertValuesToken result = new
ShardingInsertValuesToken(getStartIndex(insertValuesSegments),
getStopIndex(insertValuesSegments));
Iterator<Collection<DataNode>> originalDataNodesIterator = null ==
routeContext || routeContext.getOriginalDataNodes().isEmpty()
? null
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/DataTypeLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/DataTypeLoader.java
index 6f90ba69351..742c4210650 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/DataTypeLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/datatype/DataTypeLoader.java
@@ -42,7 +42,7 @@ public final class DataTypeLoader {
public Map<String, Integer> load(final DatabaseMetaData databaseMetaData,
final DatabaseType databaseType) throws SQLException {
Map<String, Integer> result = new
StandardDataTypeLoader().load(databaseMetaData);
Optional<DialectDataTypeLoader> loader =
TypedSPILoader.findService(DialectDataTypeLoader.class,
- (databaseType instanceof BranchDatabaseType) ?
((BranchDatabaseType) databaseType).getTrunkDatabaseType().getType() :
databaseType.getType());
+ databaseType instanceof BranchDatabaseType ?
((BranchDatabaseType) databaseType).getTrunkDatabaseType().getType() :
databaseType.getType());
if (loader.isPresent()) {
result.putAll(loader.get().load());
}
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
index 1770a72b34b..649c07f81e5 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
@@ -73,7 +73,7 @@ public final class SQLRewriteContext {
if (!((CommonSQLStatementContext<?>)
sqlStatementContext).isHintSkipSQLRewrite()) {
addSQLTokenGenerators(new
DefaultTokenGeneratorBuilder(sqlStatementContext).getSQLTokenGenerators());
}
- parameterBuilder = (sqlStatementContext instanceof
InsertStatementContext && null == ((InsertStatementContext)
sqlStatementContext).getInsertSelectContext())
+ parameterBuilder = sqlStatementContext instanceof
InsertStatementContext && null == ((InsertStatementContext)
sqlStatementContext).getInsertSelectContext()
? new GroupedParameterBuilder(
((InsertStatementContext)
sqlStatementContext).getGroupedParameters(), ((InsertStatementContext)
sqlStatementContext).getOnDuplicateKeyUpdateParameters())
: new StandardParameterBuilder(params);
diff --git
a/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtils.java
b/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtils.java
index 2d5930f412a..c19daa12fb6 100644
---
a/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtils.java
+++
b/kernel/data-pipeline/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/ColumnValueConvertUtils.java
@@ -112,7 +112,7 @@ public final class ColumnValueConvertUtils {
return Int64Value.of(localTime.toNanoOfDay());
}
if (object instanceof java.sql.Date) {
- return Int64Value.of((((java.sql.Date)
object).toLocalDate()).toEpochDay());
+ return Int64Value.of(((java.sql.Date)
object).toLocalDate().toEpochDay());
}
if (object instanceof Date) {
return converToProtobufTimestamp((Date) object);
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
index d1275466685..2aec38c6264 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
@@ -157,6 +157,9 @@ public final class DataRecordMerger {
}
private Object mergePrimaryKeyOldValue(final Column beforeColumn, final
Column column) {
- return beforeColumn.isUpdated() ? beforeColumn.getOldValue() :
(column.isUpdated() ? column.getOldValue() : null);
+ if (beforeColumn.isUpdated()) {
+ return beforeColumn.getOldValue();
+ }
+ return column.isUpdated() ? column.getOldValue() : null;
}
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataSourceImporter.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataSourceImporter.java
index a6a891d6e1b..9cac9104192 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataSourceImporter.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataSourceImporter.java
@@ -221,7 +221,7 @@ public final class DataSourceImporter extends
AbstractLifecycleExecutor implemen
}
for (int i = 0; i < conditionColumns.size(); i++) {
Column keyColumn = conditionColumns.get(i);
- preparedStatement.setObject(updatedColumns.size() + i + 1,
(keyColumn.isUniqueKey() && keyColumn.isUpdated()) ? keyColumn.getOldValue() :
keyColumn.getValue());
+ preparedStatement.setObject(updatedColumns.size() + i + 1,
keyColumn.isUniqueKey() && keyColumn.isUpdated() ? keyColumn.getOldValue() :
keyColumn.getValue());
}
int updateCount = preparedStatement.executeUpdate();
if (1 != updateCount) {
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandler.java
index a5f4026897f..5883f2e0ce4 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/netty/MySQLNegotiateHandler.java
@@ -134,6 +134,6 @@ public final class MySQLNegotiateHandler extends
ChannelInboundHandlerAdapter {
@SneakyThrows(NoSuchAlgorithmException.class)
private byte[] generateAuthResponse(final byte[] authPluginData) {
- return (null == password || password.isEmpty()) ? new byte[0] :
PasswordEncryption.encryptWithMySQL41(password.getBytes(), authPluginData);
+ return null == password || password.isEmpty() ? new byte[0] :
PasswordEncryption.encryptWithMySQL41(password.getBytes(), authPluginData);
}
}
diff --git
a/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
b/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
index 628789ef327..689f83d207f 100644
---
a/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
+++
b/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
@@ -103,7 +103,7 @@ public final class SQLFederationResultSet extends
AbstractUnsupportedOperationRe
@Override
public boolean next() {
boolean result = enumerator.moveNext();
- currentRows = result ? (enumerator.current().getClass().isArray() ?
(Object[]) enumerator.current() : new Object[]{enumerator.current()}) : new
Object[]{};
+ currentRows = result ? enumerator.current().getClass().isArray() ?
(Object[]) enumerator.current() : new Object[]{enumerator.current()} : new
Object[]{};
return result;
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
index 2bf842a0dff..7399d448716 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -100,7 +100,7 @@ public final class MetaDataChangedWatcher implements
GovernanceWatcher<Governanc
Optional<String> tableName =
DatabaseMetaDataNode.getTableName(event.getKey());
Optional<String> viewName =
DatabaseMetaDataNode.getViewName(event.getKey());
return databaseName.isPresent() && schemaName.isPresent() &&
!Strings.isNullOrEmpty(event.getValue())
- && ((tableName.isPresent() &&
!SystemSchemaBuilderRule.isSystemTable(databaseName.get(), tableName.get()) ||
viewName.isPresent()));
+ && (tableName.isPresent() &&
!SystemSchemaBuilderRule.isSystemTable(databaseName.get(), tableName.get()) ||
viewName.isPresent());
}
private Optional<GovernanceEvent> createDatabaseChangedEvent(final
DataChangedEvent event) {
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index ea06e1e665d..551813c0a63 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -713,7 +713,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
}
private CombineSegment createCombineSegment(final CombineClauseContext
ctx, final MySQLSelectStatement left) {
- CombineType combineType = (null != ctx.combineOption() && null !=
ctx.combineOption().ALL()) ? CombineType.UNION_ALL : CombineType.UNION;
+ CombineType combineType = null != ctx.combineOption() && null !=
ctx.combineOption().ALL() ? CombineType.UNION_ALL : CombineType.UNION;
MySQLSelectStatement right = null != ctx.queryPrimary() ?
(MySQLSelectStatement) visit(ctx.queryPrimary()) : (MySQLSelectStatement)
visit(ctx.queryExpressionParens());
return new CombineSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), left, combineType, right);
}
