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 075ad9bd45d Minor changes for code format (#28273)
075ad9bd45d is described below
commit 075ad9bd45df25cb80c824da6b7d9b46b7dcb931
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 27 18:39:40 2023 +0800
Minor changes for code format (#28273)
---
.../ReadwriteSplittingDistSQLStatementVisitor.java | 2 +-
.../query/ShowShadowAlgorithmsExecutor.java | 2 +-
.../shardingsphere/sharding/rule/ShardingRule.java | 4 +--
.../shardingsphere/sharding/rule/TableRule.java | 4 +--
.../core/ShardingDistSQLStatementVisitor.java | 4 +--
.../orderby/engine/OrderByContextEngine.java | 2 +-
.../statement/ddl/CloseStatementContext.java | 6 ++--
.../statement/ddl/FetchStatementContext.java | 6 ++--
.../statement/ddl/MoveStatementContext.java | 6 ++--
.../index/CreateIndexStatementSchemaRefresher.java | 5 ++--
.../espresso/EspressoInlineExpressionParser.java | 2 +-
.../driver/executor/DriverJDBCExecutor.java | 2 +-
.../metadata/ShardingSphereDatabaseMetaData.java | 4 +--
.../statement/ShardingSpherePreparedStatement.java | 2 +-
.../api/config/ingest/DumperConfiguration.java | 4 +--
.../data/pipeline/api/metadata/IdentifierName.java | 4 +--
.../process/PipelineProcessConfigurationUtils.java | 2 +-
.../common/context/PipelineContextKey.java | 2 +-
.../memory/SimpleMemoryPipelineChannel.java | 4 +--
.../core/importer/sink/PipelineDataSourceSink.java | 2 +-
.../mysql/ingest/client/PasswordEncryption.java | 2 +-
.../PostgreSQLColumnPropertiesAppender.java | 2 +-
.../core/MigrationDistSQLStatementVisitor.java | 8 ++---
.../segment/from/impl/JoinTableConverter.java | 2 +-
.../core/TrafficDistSQLStatementVisitor.java | 2 +-
.../core/kernel/KernelDistSQLStatementVisitor.java | 11 +++----
.../visitor/statement/MySQLStatementVisitor.java | 34 +++++++++++-----------
.../statement/type/MySQLDALStatementVisitor.java | 4 +--
.../statement/type/MySQLDMLStatementVisitor.java | 2 +-
.../statement/OpenGaussStatementVisitor.java | 14 ++++-----
.../visitor/statement/OracleStatementVisitor.java | 22 +++++++-------
.../statement/type/OracleDDLStatementVisitor.java | 8 ++---
.../statement/PostgreSQLStatementVisitor.java | 16 +++++-----
.../type/PostgreSQLDDLStatementVisitor.java | 2 +-
.../visitor/statement/SQL92StatementVisitor.java | 8 ++---
.../statement/type/SQL92DMLStatementVisitor.java | 2 +-
.../statement/SQLServerStatementVisitor.java | 10 +++----
.../type/SQLServerDCLStatementVisitor.java | 2 +-
.../simple/ParameterMarkerExpressionSegment.java | 2 +-
.../dml/item/ExpressionProjectionSegment.java | 2 +-
.../ral/updatable/ImportMetaDataUpdaterTest.java | 2 +-
.../hbase/result/query/HBaseGetResultSet.java | 2 +-
.../variable/charset/PostgreSQLCharacterSets.java | 2 +-
.../command/query/PostgreSQLCommand.java | 2 +-
.../segment/expression/ExpressionAssert.java | 2 +-
.../segment/projection/ProjectionAssert.java | 5 ++--
46 files changed, 120 insertions(+), 119 deletions(-)
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 688364c2b71..cc7d45cc3fc 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
@@ -66,7 +66,7 @@ public final class ReadwriteSplittingDistSQLStatementVisitor
extends ReadwriteSp
@Override
public ASTNode visitDropReadwriteSplittingRule(final
DropReadwriteSplittingRuleContext ctx) {
- return new DropReadwriteSplittingRuleStatement(ctx.ifExists() != null,
ctx.ruleName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
+ return new DropReadwriteSplittingRuleStatement(null != ctx.ifExists(),
ctx.ruleName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
}
@Override
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
index eafea8f7e67..060c0245517 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
@@ -63,7 +63,7 @@ public final class ShowShadowAlgorithmsExecutor implements
RQLExecutor<ShowShado
}
private String convertToString(final Properties props) {
- return null != props ? PropertiesConverter.convert(props) : "";
+ return null == props ? "" : PropertiesConverter.convert(props);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index 1920fbb3c68..17d9d126e79 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -143,7 +143,7 @@ public final class ShardingRule implements DatabaseRule,
DataNodeContainedRule,
if (defaultKeyGenerateAlgorithm instanceof InstanceContextAware && -1
== instanceContext.getWorkerId()) {
((InstanceContextAware)
defaultKeyGenerateAlgorithm).setInstanceContext(instanceContext);
}
- shardingCache = null != ruleConfig.getShardingCache() ? new
ShardingCache(ruleConfig.getShardingCache(), this) : null;
+ shardingCache = null == ruleConfig.getShardingCache() ? null : new
ShardingCache(ruleConfig.getShardingCache(), this);
logicalTableMapper = createLogicalTableMapper();
actualTableMapper = createActualTableMapper();
}
@@ -627,7 +627,7 @@ public final class ShardingRule implements DatabaseRule,
DataNodeContainedRule,
private KeyGenerateAlgorithm getKeyGenerateAlgorithm(final String
logicTableName) {
Optional<TableRule> tableRule = findTableRule(logicTableName);
ShardingSpherePreconditions.checkState(tableRule.isPresent(), () ->
new GenerateKeyStrategyNotFoundException(logicTableName));
- return null != tableRule.get().getKeyGeneratorName() ?
keyGenerators.get(tableRule.get().getKeyGeneratorName()) :
defaultKeyGenerateAlgorithm;
+ return null == tableRule.get().getKeyGeneratorName() ?
defaultKeyGenerateAlgorithm :
keyGenerators.get(tableRule.get().getKeyGeneratorName());
}
/**
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
index 0d2829f159e..ea7c5af15c8 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
@@ -114,7 +114,7 @@ public final class TableRule {
tableShardingStrategyConfig =
tableRuleConfig.getTableShardingStrategy();
auditStrategyConfig = tableRuleConfig.getAuditStrategy();
KeyGenerateStrategyConfiguration keyGeneratorConfig =
tableRuleConfig.getKeyGenerateStrategy();
- generateKeyColumn = null != keyGeneratorConfig &&
!Strings.isNullOrEmpty(keyGeneratorConfig.getColumn()) ?
keyGeneratorConfig.getColumn() : defaultGenerateKeyColumn;
+ generateKeyColumn = null == keyGeneratorConfig ||
Strings.isNullOrEmpty(keyGeneratorConfig.getColumn()) ?
defaultGenerateKeyColumn : keyGeneratorConfig.getColumn();
keyGeneratorName = null == keyGeneratorConfig ? null :
keyGeneratorConfig.getKeyGeneratorName();
dataSourceDataNode = actualDataNodes.isEmpty() ? null :
createDataSourceDataNode(actualDataNodes);
tableDataNode = actualDataNodes.isEmpty() ? null :
createTableDataNode(actualDataNodes);
@@ -132,7 +132,7 @@ public final class TableRule {
actualDataNodes = isEmptyDataNodes(dataNodes) ?
generateDataNodes(tableRuleConfig.getLogicTable(), dataSourceNames) :
generateDataNodes(dataNodes, dataSourceNames);
actualTables = getActualTables();
KeyGenerateStrategyConfiguration keyGeneratorConfig =
tableRuleConfig.getKeyGenerateStrategy();
- generateKeyColumn = null != keyGeneratorConfig &&
!Strings.isNullOrEmpty(keyGeneratorConfig.getColumn()) ?
keyGeneratorConfig.getColumn() : defaultGenerateKeyColumn;
+ generateKeyColumn = null == keyGeneratorConfig ||
Strings.isNullOrEmpty(keyGeneratorConfig.getColumn()) ?
defaultGenerateKeyColumn : keyGeneratorConfig.getColumn();
keyGeneratorName = null == keyGeneratorConfig ? null :
keyGeneratorConfig.getKeyGeneratorName();
dataSourceDataNode = actualDataNodes.isEmpty() ? null :
createDataSourceDataNode(actualDataNodes);
tableDataNode = actualDataNodes.isEmpty() ? null :
createTableDataNode(actualDataNodes);
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 30f2cd6b0cb..22afc469d10 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
@@ -273,8 +273,8 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
if ("none".equalsIgnoreCase(strategyType)) {
return new ShardingStrategySegment(strategyType, null, null);
}
- AlgorithmSegment algorithmSegment = null !=
ctx.shardingAlgorithm().algorithmDefinition() ? (AlgorithmSegment)
visitAlgorithmDefinition(ctx.shardingAlgorithm().algorithmDefinition()) : null;
- String shardingColumn = null != ctx.shardingColumnDefinition() ?
buildShardingColumn(ctx.shardingColumnDefinition()) : null;
+ AlgorithmSegment algorithmSegment = null ==
ctx.shardingAlgorithm().algorithmDefinition() ? null : (AlgorithmSegment)
visitAlgorithmDefinition(ctx.shardingAlgorithm().algorithmDefinition());
+ String shardingColumn = null == ctx.shardingColumnDefinition() ? null
: buildShardingColumn(ctx.shardingColumnDefinition());
return new ShardingStrategySegment(strategyType, shardingColumn,
algorithmSegment);
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngine.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngine.java
index 5bfb1e9ba65..2d64240ab4e 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngine.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngine.java
@@ -48,7 +48,7 @@ public final class OrderByContextEngine {
public OrderByContext createOrderBy(final SelectStatement selectStatement,
final GroupByContext groupByContext) {
if (!selectStatement.getOrderBy().isPresent() ||
selectStatement.getOrderBy().get().getOrderByItems().isEmpty()) {
OrderByContext orderByItems =
createOrderByContextForDistinctRowWithoutGroupBy(selectStatement,
groupByContext);
- return null != orderByItems ? orderByItems : new
OrderByContext(groupByContext.getItems(), !groupByContext.getItems().isEmpty());
+ return null == orderByItems ? new
OrderByContext(groupByContext.getItems(), !groupByContext.getItems().isEmpty())
: orderByItems;
}
List<OrderByItem> orderByItems = new LinkedList<>();
for (OrderByItemSegment each :
selectStatement.getOrderBy().get().getOrderByItems()) {
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
index cd9c978ddaa..03a6012dc0a 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
@@ -69,16 +69,16 @@ public final class CloseStatementContext extends
CommonSQLStatementContext imple
@Override
public Collection<WhereSegment> getWhereSegments() {
- return null != cursorStatementContext ?
cursorStatementContext.getWhereSegments() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getWhereSegments();
}
@Override
public Collection<ColumnSegment> getColumnSegments() {
- return null != cursorStatementContext ?
cursorStatementContext.getColumnSegments() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getColumnSegments();
}
@Override
public Collection<BinaryOperationExpression> getJoinConditions() {
- return null != cursorStatementContext ?
cursorStatementContext.getJoinConditions() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getJoinConditions();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
index 477b6cdfd91..47925e7036b 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
@@ -69,16 +69,16 @@ public final class FetchStatementContext extends
CommonSQLStatementContext imple
@Override
public Collection<WhereSegment> getWhereSegments() {
- return null != cursorStatementContext ?
cursorStatementContext.getWhereSegments() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getWhereSegments();
}
@Override
public Collection<ColumnSegment> getColumnSegments() {
- return null != cursorStatementContext ?
cursorStatementContext.getColumnSegments() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getColumnSegments();
}
@Override
public Collection<BinaryOperationExpression> getJoinConditions() {
- return null != cursorStatementContext ?
cursorStatementContext.getJoinConditions() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getJoinConditions();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
index a6497488829..be8c35b49c1 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
@@ -69,16 +69,16 @@ public final class MoveStatementContext extends
CommonSQLStatementContext implem
@Override
public Collection<WhereSegment> getWhereSegments() {
- return null != cursorStatementContext ?
cursorStatementContext.getWhereSegments() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getWhereSegments();
}
@Override
public Collection<ColumnSegment> getColumnSegments() {
- return null != cursorStatementContext ?
cursorStatementContext.getColumnSegments() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getColumnSegments();
}
@Override
public Collection<BinaryOperationExpression> getJoinConditions() {
- return null != cursorStatementContext ?
cursorStatementContext.getJoinConditions() : Collections.emptyList();
+ return null == cursorStatementContext ? Collections.emptyList() :
cursorStatementContext.getJoinConditions();
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
index bb4029a3136..6f9d013af3b 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
@@ -39,8 +39,9 @@ public final class CreateIndexStatementSchemaRefresher
implements MetaDataRefres
@Override
public void refresh(final ModeContextManager modeContextManager, final
ShardingSphereDatabase database, final Collection<String> logicDataSourceNames,
final String schemaName, final DatabaseType
databaseType, final CreateIndexStatement sqlStatement, final
ConfigurationProperties props) {
- String indexName = null != sqlStatement.getIndex() ?
sqlStatement.getIndex().getIndexName().getIdentifier().getValue()
- :
IndexMetaDataUtils.getGeneratedLogicIndexName(sqlStatement.getColumns());
+ String indexName = null == sqlStatement.getIndex()
+ ?
IndexMetaDataUtils.getGeneratedLogicIndexName(sqlStatement.getColumns())
+ :
sqlStatement.getIndex().getIndexName().getIdentifier().getValue();
if (Strings.isNullOrEmpty(indexName)) {
return;
}
diff --git
a/infra/expr/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
b/infra/expr/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
index 75729686cac..bfe5201bb08 100644
---
a/infra/expr/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
+++
b/infra/expr/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
@@ -46,7 +46,7 @@ public final class EspressoInlineExpressionParser implements
InlineExpressionPar
static {
URL resource =
Thread.currentThread().getContextClassLoader().getResource("espresso-need-libs");
- String dir = null != resource ? resource.getPath() : null;
+ String dir = null == resource ? null : resource.getPath();
JAVA_CLASSPATH = dir + File.separator + "groovy.jar";
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index 8ab8af641c6..5ee5584e957 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -115,7 +115,7 @@ public final class DriverJDBCExecutor {
private int accumulate(final List<Integer> updateResults) {
int result = 0;
for (Integer each : updateResults) {
- result += null != each ? each : 0;
+ result += null == each ? 0 : each;
}
return result;
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
index e3771090da8..4cf8b2dbec1 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
@@ -224,13 +224,13 @@ public final class ShardingSphereDatabaseMetaData extends
AdaptedDatabaseMetaDat
private String getActualCatalog(final String catalog) {
ConnectionProperties connectionProps = connection.getContextManager()
.getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getConnectionProperties(getDataSourceName());
- return null != catalog && catalog.contains(DefaultDatabase.LOGIC_NAME)
? connectionProps.getCatalog() : catalog;
+ return null == catalog ||
!catalog.contains(DefaultDatabase.LOGIC_NAME) ? catalog :
connectionProps.getCatalog();
}
private String getActualSchema(final String schema) {
ConnectionProperties connectionProps = connection.getContextManager()
.getMetaDataContexts().getMetaData().getDatabase(connection.getDatabaseName()).getResourceMetaData().getConnectionProperties(getDataSourceName());
- return null != schema && schema.contains(DefaultDatabase.LOGIC_NAME) ?
connectionProps.getSchema() : schema;
+ return null == schema || !schema.contains(DefaultDatabase.LOGIC_NAME)
? schema : connectionProps.getSchema();
}
private String getDataSourceName() {
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 4557cfc16b0..31e0c87d5a5 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -633,7 +633,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
try {
QueryContext queryContext = createQueryContext();
trafficInstanceId = getInstanceIdAndSet(queryContext).orElse(null);
- executionContext = null != trafficInstanceId ?
createExecutionContext(queryContext, trafficInstanceId) :
createExecutionContext(queryContext);
+ executionContext = null == trafficInstanceId ?
createExecutionContext(queryContext) : createExecutionContext(queryContext,
trafficInstanceId);
batchPreparedStatementExecutor.addBatchForExecutionUnits(executionContext.getExecutionUnits());
} finally {
currentResultSet = null;
diff --git
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
index 044658d2aa9..474ea9cc8be 100644
---
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
+++
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/config/ingest/DumperConfiguration.java
@@ -113,7 +113,7 @@ public class DumperConfiguration {
* @return column names
*/
public Optional<List<String>> getColumnNames(final LogicTableName
logicTableName) {
- Set<ColumnName> columnNames = null != targetTableColumnsMap ?
targetTableColumnsMap.get(logicTableName) : null;
+ Set<ColumnName> columnNames = null == targetTableColumnsMap ? null :
targetTableColumnsMap.get(logicTableName);
if (null == columnNames) {
return Optional.empty();
}
@@ -127,7 +127,7 @@ public class DumperConfiguration {
* @return column names of table
*/
public Optional<Set<ColumnName>> getColumnNameSet(final String
actualTableName) {
- Set<ColumnName> result = null != targetTableColumnsMap ?
targetTableColumnsMap.get(getLogicTableName(actualTableName)) : null;
+ Set<ColumnName> result = null == targetTableColumnsMap ? null :
targetTableColumnsMap.get(getLogicTableName(actualTableName));
return Optional.ofNullable(result);
}
}
diff --git
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
index b6a2776da06..9407dcfe52b 100644
---
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
+++
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
@@ -35,8 +35,8 @@ public class IdentifierName {
private final String lowercase;
public IdentifierName(final String identifierName) {
- this.original = identifierName;
- this.lowercase = null != identifierName ? identifierName.toLowerCase()
: null;
+ original = identifierName;
+ lowercase = null == identifierName ? null :
identifierName.toLowerCase();
}
@Override
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/process/PipelineProcessConfigurationUtils.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/process/PipelineProcessConfigurationUtils.java
index a9f59d0ccbb..03ed066825c 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/process/PipelineProcessConfigurationUtils.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/process/PipelineProcessConfigurationUtils.java
@@ -42,7 +42,7 @@ public final class PipelineProcessConfigurationUtils {
* @return process configuration
*/
public static PipelineProcessConfiguration convertWithDefaultValue(final
PipelineProcessConfiguration originalConfig) {
- YamlPipelineProcessConfiguration yamlConfig = null != originalConfig ?
SWAPPER.swapToYamlConfiguration(originalConfig) : new
YamlPipelineProcessConfiguration();
+ YamlPipelineProcessConfiguration yamlConfig = null == originalConfig ?
new YamlPipelineProcessConfiguration() :
SWAPPER.swapToYamlConfiguration(originalConfig);
fillInDefaultValue(yamlConfig);
return SWAPPER.swapToObject(yamlConfig);
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/PipelineContextKey.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/PipelineContextKey.java
index 1e946606dde..179095afb55 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/PipelineContextKey.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/PipelineContextKey.java
@@ -70,7 +70,7 @@ public final class PipelineContextKey {
if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (null == o || getClass() != o.getClass()) {
return false;
}
final PipelineContextKey that = (PipelineContextKey) o;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java
index d60d04be557..e7cd89705f8 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java
@@ -75,13 +75,13 @@ public final class SimpleMemoryPipelineChannel implements
PipelineChannel {
@Override
public List<Record> peekRecords() {
List<Record> result = queue.peek();
- return null != result ? result : Collections.emptyList();
+ return null == result ? Collections.emptyList() : result;
}
@Override
public List<Record> pollRecords() {
List<Record> result = queue.poll();
- return null != result ? result : Collections.emptyList();
+ return null == result ? Collections.emptyList() : result;
}
@Override
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java
index d4d8774c790..b193b5324f5 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java
@@ -240,7 +240,7 @@ public final class PipelineDataSourceSink implements
PipelineSink {
for (int i = 0; i < conditionColumns.size(); i++) {
Column keyColumn = conditionColumns.get(i);
// TODO There to be compatible with PostgreSQL before value is
null except primary key and unsupported updating sharding value now.
- if (shardingColumns.contains(keyColumn.getName()) &&
keyColumn.getOldValue() == null) {
+ if (shardingColumns.contains(keyColumn.getName()) && null ==
keyColumn.getOldValue()) {
preparedStatement.setObject(setColumns.size() + i + 1,
keyColumn.getValue());
continue;
}
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/PasswordEncryption.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/PasswordEncryption.java
index ef3ac6086b7..7fa8fd3028f 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/PasswordEncryption.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/client/PasswordEncryption.java
@@ -87,7 +87,7 @@ public final class PasswordEncryption {
*/
@SneakyThrows(GeneralSecurityException.class)
public static byte[] encryptWithRSAPublicKey(final String password, final
byte[] seed, final String transformation, final String publicKey) {
- byte[] formattedPassword = password != null ?
Bytes.concat(password.getBytes(), new byte[]{0}) : new byte[]{0};
+ byte[] formattedPassword = null == password ? new byte[]{0} :
Bytes.concat(password.getBytes(), new byte[]{0});
return encryptWithRSAPublicKey(xor(formattedPassword, seed,
formattedPassword.length), parseRSAPublicKey(publicKey), transformation);
}
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
index 01824305842..ea99972f0bd 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
@@ -203,7 +203,7 @@ public final class PostgreSQLColumnPropertiesAppender
extends AbstractPostgreSQL
String namespace = (String) column.get("typnspname");
String typeName = (String) column.get("typname");
Integer numdims = (Integer) column.get("attndims");
- String schema = null != namespace ? namespace : "";
+ String schema = null == namespace ? "" : namespace;
String name = checkSchemaInName(typeName, schema);
if (name.startsWith("_")) {
if (null == numdims || 0 == numdims) {
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
index 995d434f187..839a5ee9f2d 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
+++
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
@@ -152,10 +152,10 @@ public final class MigrationDistSQLStatementVisitor
extends MigrationDistSQLStat
String user = getIdentifierValue(ctx.user());
String password = null == ctx.password() ? "" :
getPassword(ctx.password());
Properties props = getProperties(ctx.propertiesDefinition());
- return null != ctx.urlSource() ? new
URLBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
- getIdentifierValue(ctx.urlSource().url()), user, password,
props)
- : new
HostnameAndPortBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
- getIdentifierValue(ctx.simpleSource().hostname()),
ctx.simpleSource().port().getText(),
getIdentifierValue(ctx.simpleSource().dbName()), user, password, props);
+ return null == ctx.urlSource()
+ ? new
HostnameAndPortBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
+ getIdentifierValue(ctx.simpleSource().hostname()),
ctx.simpleSource().port().getText(),
getIdentifierValue(ctx.simpleSource().dbName()), user, password, props)
+ : new
URLBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
getIdentifierValue(ctx.urlSource().url()), user, password, props);
}
private String getPassword(final PasswordContext ctx) {
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/JoinTableConverter.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/JoinTableConverter.java
index 1e907504aa1..869b42556d2 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/JoinTableConverter.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/converter/segment/from/impl/JoinTableConverter.java
@@ -54,7 +54,7 @@ public final class JoinTableConverter implements
SQLSegmentConverter<JoinTableSe
if (!segment.getUsing().isEmpty()) {
return JoinConditionType.USING.symbol(SqlParserPos.ZERO);
}
- return null != segment.getCondition() ?
JoinConditionType.ON.symbol(SqlParserPos.ZERO) :
JoinConditionType.NONE.symbol(SqlParserPos.ZERO);
+ return null == segment.getCondition() ?
JoinConditionType.NONE.symbol(SqlParserPos.ZERO) :
JoinConditionType.ON.symbol(SqlParserPos.ZERO);
}
private Optional<SqlNode> convertJoinCondition(final JoinTableSegment
segment) {
diff --git
a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
index b842f50c7f9..7951ff6a816 100644
---
a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
+++
b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
@@ -52,7 +52,7 @@ public final class TrafficDistSQLStatementVisitor extends
TrafficDistSQLStatemen
@Override
public ASTNode visitTrafficRuleDefinition(final
TrafficRuleDefinitionContext ctx) {
- AlgorithmSegment loadBalancerSegment = null !=
ctx.loadBalancerDefinition() ? (AlgorithmSegment)
visit(ctx.loadBalancerDefinition().algorithmDefinition()) : null;
+ AlgorithmSegment loadBalancerSegment = null ==
ctx.loadBalancerDefinition() ? null : (AlgorithmSegment)
visit(ctx.loadBalancerDefinition().algorithmDefinition());
return new TrafficRuleSegment(
getIdentifierValue(ctx.ruleName()),
buildLabels(ctx.labelDefinition()), (AlgorithmSegment)
visit(ctx.trafficAlgorithmDefinition().algorithmDefinition()),
loadBalancerSegment);
}
diff --git
a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index b1391d1c32b..881dc58c425 100644
---
a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++
b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -137,9 +137,10 @@ public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementB
String user = getIdentifierValue(ctx.user());
String password = null == ctx.password() ? "" :
getPassword(ctx.password());
Properties props = getProperties(ctx.propertiesDefinition());
- return null != ctx.urlSource() ? new
URLBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
getIdentifierValue(ctx.urlSource().url()), user, password, props)
- : new
HostnameAndPortBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
getIdentifierValue(ctx.simpleSource().hostname()),
- ctx.simpleSource().port().getText(),
getIdentifierValue(ctx.simpleSource().dbName()), user, password, props);
+ return null == ctx.urlSource()
+ ? new
HostnameAndPortBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
+ getIdentifierValue(ctx.simpleSource().hostname()),
ctx.simpleSource().port().getText(),
getIdentifierValue(ctx.simpleSource().dbName()), user, password, props)
+ : new
URLBasedDataSourceSegment(getIdentifierValue(ctx.storageUnitName()),
getIdentifierValue(ctx.urlSource().url()), user, password, props);
}
private String getPassword(final PasswordContext ctx) {
@@ -174,7 +175,7 @@ public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementB
@Override
public ASTNode visitLabelComputeNode(final LabelComputeNodeContext ctx) {
Collection<String> labels =
ctx.label().stream().map(this::getIdentifierValue).collect(Collectors.toList());
- return new LabelComputeNodeStatement(ctx.RELABEL() != null,
getIdentifierValue(ctx.instanceId()), labels);
+ return new LabelComputeNodeStatement(null != ctx.RELABEL(),
getIdentifierValue(ctx.instanceId()), labels);
}
@Override
@@ -206,7 +207,7 @@ public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementB
@Override
public ASTNode visitUnregisterStorageUnit(final
UnregisterStorageUnitContext ctx) {
boolean ignoreSingleTables = null != ctx.ignoreSingleTables();
- return new UnregisterStorageUnitStatement(ctx.ifExists() != null,
+ return new UnregisterStorageUnitStatement(null != ctx.ifExists(),
ctx.storageUnitName().stream().map(ParseTree::getText).map(each -> new
IdentifierValue(each).getValue()).collect(Collectors.toList()),
ignoreSingleTables);
}
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
index 04d14fffd13..796e02f53e6 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
@@ -490,7 +490,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
} else {
right = new SubqueryExpressionSegment(new
SubquerySegment(ctx.subquery().start.getStartIndex(),
ctx.subquery().stop.getStopIndex(), (MySQLSelectStatement)
visit(ctx.subquery())));
}
- String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
+ String operator = null == ctx.SAFE_EQ_() ?
ctx.comparisonOperator().getText() : ctx.SAFE_EQ_().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -543,7 +543,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
listExpression.getItems().add((ExpressionSegment) visit(each));
}
right = listExpression;
- operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
+ operator = null == ctx.NOT() ? "LIKE" : "NOT LIKE";
}
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
@@ -552,7 +552,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
private BinaryOperationExpression
createBinaryOperationExpressionFromRegexp(final PredicateContext ctx) {
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment right = (ExpressionSegment) visit(ctx.bitExpr(1));
- String operator = null != ctx.NOT() ? "NOT REGEXP" : "REGEXP";
+ String operator = null == ctx.NOT() ? "REGEXP" : "NOT REGEXP";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -560,7 +560,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
private BinaryOperationExpression
createBinaryOperationExpressionFromRlike(final PredicateContext ctx) {
ExpressionSegment left = (ExpressionSegment) visit(ctx.bitExpr(0));
ExpressionSegment right = (ExpressionSegment) visit(ctx.bitExpr(1));
- String operator = null != ctx.NOT() ? "NOT RLIKE" : "RLIKE";
+ String operator = null == ctx.NOT() ? "RLIKE" : "NOT RLIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -748,9 +748,9 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
if (null != ctx.EXCEPT()) {
combineType = CombineType.EXCEPT;
} else {
- combineType = null != ctx.combineOption() && null !=
ctx.combineOption().ALL() ? CombineType.UNION_ALL : CombineType.UNION;
+ combineType = null == ctx.combineOption() || null ==
ctx.combineOption().ALL() ? CombineType.UNION : CombineType.UNION_ALL;
}
- MySQLSelectStatement right = null != ctx.queryPrimary() ?
(MySQLSelectStatement) visit(ctx.queryPrimary()) : (MySQLSelectStatement)
visit(ctx.queryExpressionParens());
+ MySQLSelectStatement right = null == ctx.queryPrimary() ?
(MySQLSelectStatement) visit(ctx.queryExpressionParens()) :
(MySQLSelectStatement) visit(ctx.queryPrimary());
return new CombineSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), left, combineType, right);
}
@@ -1134,7 +1134,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
@Override
public final ASTNode visitRegularFunction(final RegularFunctionContext
ctx) {
- return null != ctx.completeRegularFunction() ?
visit(ctx.completeRegularFunction()) : visit(ctx.shorthandRegularFunction());
+ return null == ctx.completeRegularFunction() ?
visit(ctx.shorthandRegularFunction()) : visit(ctx.completeRegularFunction());
}
@Override
@@ -1196,7 +1196,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
@Override
public ASTNode visitVariable(final VariableContext ctx) {
- return null != ctx.systemVariable() ? visit(ctx.systemVariable()) :
visit(ctx.userVariable());
+ return null == ctx.systemVariable() ? visit(ctx.userVariable()) :
visit(ctx.systemVariable());
}
@Override
@@ -1286,7 +1286,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
public final ASTNode visitOrderByItem(final OrderByItemContext ctx) {
OrderDirection orderDirection;
if (null != ctx.direction()) {
- orderDirection = null != ctx.direction().DESC() ?
OrderDirection.DESC : OrderDirection.ASC;
+ orderDirection = null == ctx.direction().DESC() ?
OrderDirection.ASC : OrderDirection.DESC;
} else {
orderDirection = OrderDirection.ASC;
}
@@ -1693,7 +1693,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
}
if (projection instanceof BinaryOperationExpression) {
int startIndex = projection.getStartIndex();
- int stopIndex = null != alias ? alias.getStopIndex() :
projection.getStopIndex();
+ int stopIndex = null == alias ? projection.getStopIndex() :
alias.getStopIndex();
ExpressionProjectionSegment result = new
ExpressionProjectionSegment(startIndex, stopIndex, projection.getText(),
projection);
result.setAlias(alias);
return result;
@@ -1763,7 +1763,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
public ASTNode visitTableReference(final TableReferenceContext ctx) {
TableSegment result;
TableSegment left;
- left = null != ctx.tableFactor() ? (TableSegment)
visit(ctx.tableFactor()) : (TableSegment) visit(ctx.escapedTableReference());
+ left = null == ctx.tableFactor() ? (TableSegment)
visit(ctx.escapedTableReference()) : (TableSegment) visit(ctx.tableFactor());
for (JoinedTableContext each : ctx.joinedTable()) {
left = visitJoinedTable(each, left);
}
@@ -1799,9 +1799,9 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
result.setStopIndex(ctx.stop.getStopIndex());
result.setJoinType(getJoinType(ctx));
result.setNatural(null != ctx.naturalJoinType());
- TableSegment right = null != ctx.tableFactor() ? (TableSegment)
visit(ctx.tableFactor()) : (TableSegment) visit(ctx.tableReference());
+ TableSegment right = null == ctx.tableFactor() ? (TableSegment)
visit(ctx.tableReference()) : (TableSegment) visit(ctx.tableFactor());
result.setRight(right);
- return null != ctx.joinSpecification() ?
visitJoinSpecification(ctx.joinSpecification(), result) : result;
+ return null == ctx.joinSpecification() ? result :
visitJoinSpecification(ctx.joinSpecification(), result);
}
private String getJoinType(final JoinedTableContext ctx) {
@@ -1809,7 +1809,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
return JoinType.INNER.name();
}
if (null != ctx.outerJoinType()) {
- return ctx.outerJoinType().LEFT() != null ? JoinType.LEFT.name() :
JoinType.RIGHT.name();
+ return null == ctx.outerJoinType().LEFT() ? JoinType.RIGHT.name()
: JoinType.LEFT.name();
}
if (null != ctx.naturalJoinType()) {
return getNaturalJoinType(ctx.naturalJoinType());
@@ -1820,11 +1820,11 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
private String getNaturalJoinType(final NaturalJoinTypeContext ctx) {
if (null != ctx.LEFT()) {
return JoinType.LEFT.name();
- } else if (null != ctx.RIGHT()) {
+ }
+ if (null != ctx.RIGHT()) {
return JoinType.RIGHT.name();
- } else {
- return JoinType.INNER.name();
}
+ return JoinType.INNER.name();
}
private JoinTableSegment visitJoinSpecification(final
JoinSpecificationContext ctx, final JoinTableSegment result) {
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
index a0e9e7410e3..d06c4985350 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
@@ -973,8 +973,8 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitSetCharacter(final SetCharacterContext ctx) {
VariableAssignSegment characterSet = new VariableAssignSegment();
- int startIndex = null != ctx.CHARSET() ?
ctx.CHARSET().getSymbol().getStartIndex() :
ctx.CHARACTER().getSymbol().getStartIndex();
- int stopIndex = null != ctx.CHARSET() ?
ctx.CHARSET().getSymbol().getStopIndex() :
ctx.SET(1).getSymbol().getStopIndex();
+ int startIndex = null == ctx.CHARSET() ?
ctx.CHARACTER().getSymbol().getStartIndex() :
ctx.CHARSET().getSymbol().getStartIndex();
+ int stopIndex = null == ctx.CHARSET() ?
ctx.SET(1).getSymbol().getStopIndex() :
ctx.CHARSET().getSymbol().getStopIndex();
// TODO Consider setting all three system variables:
character_set_client, character_set_results, character_set_connection
String variableName = (null != ctx.CHARSET()) ?
ctx.CHARSET().getText() : "character_set_client";
VariableSegment variable = new VariableSegment(startIndex, stopIndex,
variableName);
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementVisitor.java
index bc4cb9a55a8..010d3228a48 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementVisitor.java
@@ -70,7 +70,7 @@ public final class MySQLDMLStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitLoadStatement(final LoadStatementContext ctx) {
- return null != ctx.loadDataStatement() ?
visit(ctx.loadDataStatement()) : visit(ctx.loadXmlStatement());
+ return null == ctx.loadDataStatement() ? visit(ctx.loadXmlStatement())
: visit(ctx.loadDataStatement());
}
@Override
diff --git
a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
index 182667c2619..f997564004f 100644
---
a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
+++
b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
@@ -225,7 +225,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
@Override
public final ASTNode visitIdentifier(final IdentifierContext ctx) {
UnreservedWordContext unreservedWord = ctx.unreservedWord();
- return null != unreservedWord ? visit(unreservedWord) : new
IdentifierValue(ctx.getText());
+ return null == unreservedWord ? new IdentifierValue(ctx.getText()) :
visit(unreservedWord);
}
@Override
@@ -506,7 +506,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
}
if (null != ctx.constTypeName() || null != ctx.funcName() && null ==
ctx.LP_()) {
LiteralExpressionSegment expression = new
LiteralExpressionSegment(ctx.STRING_().getSymbol().getStartIndex(),
ctx.STRING_().getSymbol().getStopIndex(), value.getValue().toString());
- String dataType = null != ctx.constTypeName() ?
ctx.constTypeName().getText() : ctx.funcName().getText();
+ String dataType = null == ctx.constTypeName() ?
ctx.funcName().getText() : ctx.constTypeName().getText();
return new TypeCastExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), ctx.getText(), expression, dataType);
}
return SQLUtils.createLiteralExpression(value,
ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.getText());
@@ -629,7 +629,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
@Override
public final ASTNode visitSortby(final SortbyContext ctx) {
- OrderDirection orderDirection = null != ctx.ascDesc() ?
generateOrderDirection(ctx.ascDesc()) : OrderDirection.ASC;
+ OrderDirection orderDirection = null == ctx.ascDesc() ?
OrderDirection.ASC : generateOrderDirection(ctx.ascDesc());
NullsOrderType nullsOrderType =
generateNullsOrderType(ctx.nullsOrder());
ASTNode expr = visit(ctx.aExpr());
if (expr instanceof ColumnSegment) {
@@ -1183,14 +1183,14 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
private JoinTableSegment getJoinTableSegment(final TableReferenceContext
ctx) {
JoinTableSegment result = new JoinTableSegment();
result.setLeft((TableSegment) visit(ctx.tableReference()));
- int startIndex = null != ctx.LP_() ?
ctx.LP_().getSymbol().getStartIndex() :
ctx.tableReference().start.getStartIndex();
+ int startIndex = null == ctx.LP_() ?
ctx.tableReference().start.getStartIndex() :
ctx.LP_().getSymbol().getStartIndex();
int stopIndex = 0;
AliasSegment alias = null;
- if (null != ctx.aliasClause()) {
+ if (null == ctx.aliasClause()) {
+ stopIndex = null == ctx.RP_() ?
ctx.tableReference().start.getStopIndex() :
ctx.RP_().getSymbol().getStopIndex();
+ } else {
alias = (AliasSegment) visit(ctx.aliasClause());
startIndex = null == ctx.RP_() ?
ctx.joinedTable().stop.getStopIndex() : ctx.RP_().getSymbol().getStopIndex();
- } else {
- stopIndex = null == ctx.RP_() ?
ctx.tableReference().start.getStopIndex() :
ctx.RP_().getSymbol().getStopIndex();
}
result.setStartIndex(startIndex);
result.setStopIndex(stopIndex);
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
index ab886503579..4cc080ef8cf 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
@@ -240,7 +240,7 @@ public abstract class OracleStatementVisitor extends
OracleStatementBaseVisitor<
@Override
public final ASTNode visitIdentifier(final IdentifierContext ctx) {
UnreservedWordContext unreservedWord = ctx.unreservedWord();
- return null != unreservedWord ? visit(unreservedWord) : new
IdentifierValue(ctx.getText());
+ return null == unreservedWord ? new IdentifierValue(ctx.getText()) :
visit(unreservedWord);
}
@Override
@@ -369,19 +369,19 @@ public abstract class OracleStatementVisitor extends
OracleStatementBaseVisitor<
ExpressionSegment left = (ColumnSegment)
visitColumnName(ctx.multisetExpr().columnName(0));
ExpressionSegment right = (ColumnSegment)
visitColumnName(ctx.multisetExpr().columnName(1));
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- String keyWord = ctx.multisetExpr().DISTINCT() != null ? "DISTINCT" :
"ALL";
+ String keyWord = null == ctx.multisetExpr().DISTINCT() ? "ALL" :
"DISTINCT";
return new MultisetExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right,
ctx.multisetExpr().multisetOperator().getText(), keyWord, text);
}
private ASTNode createDatetimeExpression(final ExprContext ctx, final
DatetimeExprContext datetimeExpr) {
ExpressionSegment left = (ExpressionSegment) visit(ctx.expr(0));
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
- if (null != datetimeExpr.expr()) {
- ExpressionSegment right = new
ExpressionProjectionSegment(datetimeExpr.getStart().getStartIndex(),
- datetimeExpr.getStop().getStopIndex(),
datetimeExpr.getText(), (ExpressionSegment) visit(datetimeExpr.expr()));
- return new DatetimeExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, text);
+ if (null == datetimeExpr.expr()) {
+ return new DatetimeExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, text);
}
- return new DatetimeExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, text);
+ ExpressionSegment right = new
ExpressionProjectionSegment(datetimeExpr.getStart().getStartIndex(),
+ datetimeExpr.getStop().getStopIndex(), datetimeExpr.getText(),
(ExpressionSegment) visit(datetimeExpr.expr()));
+ return new DatetimeExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, text);
}
private ASTNode createBinaryOperationExpression(final ExprContext ctx,
final String operator) {
@@ -430,7 +430,7 @@ public abstract class OracleStatementVisitor extends
OracleStatementBaseVisitor<
} else {
right = new SubqueryExpressionSegment(new
SubquerySegment(ctx.subquery().start.getStartIndex(),
ctx.subquery().stop.getStopIndex(), (OracleSelectStatement)
visit(ctx.subquery())));
}
- String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
+ String operator = null == ctx.SAFE_EQ_() ?
ctx.comparisonOperator().getText() : ctx.SAFE_EQ_().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -471,7 +471,7 @@ public abstract class OracleStatementVisitor extends
OracleStatementBaseVisitor<
for (SimpleExprContext each : ctx.simpleExpr()) {
right.getItems().add((ExpressionSegment) visit(each));
}
- String operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
+ String operator = null == ctx.NOT() ? "LIKE" : "NOT LIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -891,7 +891,7 @@ public abstract class OracleStatementVisitor extends
OracleStatementBaseVisitor<
public final ASTNode visitTranslateFunction(final
OracleStatementParser.TranslateFunctionContext ctx) {
FunctionSegment result = new
FunctionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(),
ctx.TRANSLATE().getText(), getOriginalText(ctx));
result.getParameters().add((ExpressionSegment) visit(ctx.expr()));
- TerminalNode charSet = null != ctx.NCHAR_CS() ? ctx.NCHAR_CS() :
ctx.CHAR_CS();
+ TerminalNode charSet = null == ctx.NCHAR_CS() ? ctx.CHAR_CS() :
ctx.NCHAR_CS();
result.getParameters().add(new
LiteralExpressionSegment(charSet.getSymbol().getStartIndex(),
charSet.getSymbol().getStopIndex(), charSet.getText()));
return result;
}
@@ -1006,7 +1006,7 @@ public abstract class OracleStatementVisitor extends
OracleStatementBaseVisitor<
@Override
public final ASTNode visitOrderByItem(final OrderByItemContext ctx) {
- OrderDirection orderDirection = null != ctx.DESC() ?
OrderDirection.DESC : OrderDirection.ASC;
+ OrderDirection orderDirection = null == ctx.DESC() ?
OrderDirection.ASC : OrderDirection.DESC;
NullsOrderType nullsOrderType = generateNullsOrderType(ctx);
if (null != ctx.columnName()) {
ColumnSegment column = (ColumnSegment) visit(ctx.columnName());
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
index acdadd2c9e1..823c0e181ac 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
@@ -386,7 +386,7 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
@Override
public ASTNode visitColumnDefinition(final ColumnDefinitionContext ctx) {
ColumnSegment column = (ColumnSegment) visit(ctx.columnName());
- DataTypeSegment dataType = null != ctx.dataType() ? (DataTypeSegment)
visit(ctx.dataType()) : null;
+ DataTypeSegment dataType = null == ctx.dataType() ? null :
(DataTypeSegment) visit(ctx.dataType());
boolean isPrimaryKey = ctx.inlineConstraint().stream().anyMatch(each
-> null != each.primaryKey());
boolean isNotNull = ctx.inlineConstraint().stream().anyMatch(each ->
null != each.NOT() && null != each.NULL());
ColumnDefinitionSegment result = new
ColumnDefinitionSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), column, dataType, isPrimaryKey, isNotNull);
@@ -549,7 +549,7 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
@Override
public ASTNode visitModifyColProperties(final ModifyColPropertiesContext
ctx) {
ColumnSegment column = (ColumnSegment) visit(ctx.columnName());
- DataTypeSegment dataType = null != ctx.dataType() ? (DataTypeSegment)
visit(ctx.dataType()) : null;
+ DataTypeSegment dataType = null == ctx.dataType() ? null :
(DataTypeSegment) visit(ctx.dataType());
// TODO visit pk and reference table
return new ColumnDefinitionSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), column, dataType, false, false);
}
@@ -727,7 +727,7 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
@Override
public ASTNode visitIndexExpression(final IndexExpressionContext ctx) {
- return null != ctx.expr() ? visit(ctx.expr()) :
visit(ctx.columnName());
+ return null == ctx.expr() ? visit(ctx.columnName()) :
visit(ctx.expr());
}
@Override
@@ -848,7 +848,7 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
@Override
public ASTNode visitAudit(final AuditContext ctx) {
- return null != ctx.auditTraditional() ? visit(ctx.auditTraditional())
: visit(ctx.auditUnified());
+ return null == ctx.auditTraditional() ? visit(ctx.auditUnified()) :
visit(ctx.auditTraditional());
}
@Override
diff --git
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
index dfac62fcb7d..6789e0653e6 100644
---
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
+++
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
@@ -225,7 +225,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
@Override
public final ASTNode visitIdentifier(final IdentifierContext ctx) {
UnreservedWordContext unreservedWord = ctx.unreservedWord();
- return null != unreservedWord ? visit(unreservedWord) : new
IdentifierValue(ctx.getText());
+ return null == unreservedWord ? new IdentifierValue(ctx.getText()) :
visit(unreservedWord);
}
@Override
@@ -503,7 +503,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
}
if (null != ctx.constTypeName() || null != ctx.funcName() && null ==
ctx.LP_()) {
LiteralExpressionSegment expression = new
LiteralExpressionSegment(ctx.STRING_().getSymbol().getStartIndex(),
ctx.STRING_().getSymbol().getStopIndex(), value.getValue().toString());
- String dataType = null != ctx.constTypeName() ?
ctx.constTypeName().getText() : ctx.funcName().getText();
+ String dataType = null == ctx.constTypeName() ?
ctx.funcName().getText() : ctx.constTypeName().getText();
return new TypeCastExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), ctx.getText(), expression, dataType);
}
return SQLUtils.createLiteralExpression(value,
ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.getText());
@@ -626,7 +626,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
@Override
public final ASTNode visitSortby(final SortbyContext ctx) {
- OrderDirection orderDirection = null != ctx.ascDesc() ?
generateOrderDirection(ctx.ascDesc()) : OrderDirection.ASC;
+ OrderDirection orderDirection = null == ctx.ascDesc() ?
OrderDirection.ASC : generateOrderDirection(ctx.ascDesc());
NullsOrderType nullsOrderType =
generateNullsOrderType(ctx.nullsOrder());
ASTNode expr = visit(ctx.aExpr());
if (expr instanceof ColumnSegment) {
@@ -1123,7 +1123,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
if (null != ctx.selectWithParens()) {
PostgreSQLSelectStatement select = (PostgreSQLSelectStatement)
visit(ctx.selectWithParens());
SubquerySegment subquery = new
SubquerySegment(ctx.selectWithParens().start.getStartIndex(),
ctx.selectWithParens().stop.getStopIndex(), select);
- AliasSegment alias = null != ctx.aliasClause() ? (AliasSegment)
visit(ctx.aliasClause()) : null;
+ AliasSegment alias = null == ctx.aliasClause() ? null :
(AliasSegment) visit(ctx.aliasClause());
SubqueryTableSegment result = new SubqueryTableSegment(subquery);
result.setAlias(alias);
return result;
@@ -1135,14 +1135,14 @@ public abstract class PostgreSQLStatementVisitor
extends PostgreSQLStatementPars
}
JoinTableSegment result = new JoinTableSegment();
result.setLeft((TableSegment) visit(ctx.tableReference()));
- int startIndex = null != ctx.LP_() ?
ctx.LP_().getSymbol().getStartIndex() :
ctx.tableReference().start.getStartIndex();
+ int startIndex = null == ctx.LP_() ?
ctx.tableReference().start.getStartIndex() :
ctx.LP_().getSymbol().getStartIndex();
int stopIndex = 0;
AliasSegment alias = null;
if (null == ctx.aliasClause()) {
- stopIndex = null != ctx.RP_() ?
ctx.RP_().getSymbol().getStopIndex() :
ctx.tableReference().start.getStopIndex();
+ stopIndex = null == ctx.RP_() ?
ctx.tableReference().start.getStopIndex() :
ctx.RP_().getSymbol().getStopIndex();
} else {
alias = (AliasSegment) visit(ctx.aliasClause());
- startIndex = null != ctx.RP_() ?
ctx.RP_().getSymbol().getStopIndex() : ctx.joinedTable().stop.getStopIndex();
+ startIndex = null == ctx.RP_() ?
ctx.joinedTable().stop.getStopIndex() : ctx.RP_().getSymbol().getStopIndex();
}
result.setStartIndex(startIndex);
result.setStopIndex(stopIndex);
@@ -1193,7 +1193,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
private static String getOutJoinType(final OuterJoinTypeContext ctx) {
if (null == ctx.FULL()) {
- return null != ctx.LEFT() ? JoinType.LEFT.name() :
JoinType.RIGHT.name();
+ return null == ctx.LEFT() ? JoinType.RIGHT.name() :
JoinType.LEFT.name();
}
return JoinType.FULL.name();
}
diff --git
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
index b7077430c17..81a1cf628be 100644
---
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
+++
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
@@ -612,7 +612,7 @@ public final class PostgreSQLDDLStatementVisitor extends
PostgreSQLStatementVisi
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropTable(final DropTableContext ctx) {
- boolean containsCascade = null != ctx.dropTableOpt() && null !=
ctx.dropTableOpt().CASCADE();
+ boolean containsCascade = ctx.dropTableOpt() != null && null !=
ctx.dropTableOpt().CASCADE();
PostgreSQLDropTableStatement result = new
PostgreSQLDropTableStatement(null != ctx.ifExists(), containsCascade);
result.getTables().addAll(((CollectionValue<SimpleTableSegment>)
visit(ctx.tableNames())).getValue());
return result;
diff --git
a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92StatementVisitor.java
b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92StatementVisitor.java
index 41b07f4d8b4..265e97faef0 100644
---
a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92StatementVisitor.java
+++
b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92StatementVisitor.java
@@ -175,7 +175,7 @@ public abstract class SQL92StatementVisitor extends
SQL92StatementBaseVisitor<AS
@Override
public final ASTNode visitIdentifier(final IdentifierContext ctx) {
UnreservedWordContext unreservedWord = ctx.unreservedWord();
- return null != unreservedWord ? visit(unreservedWord) : new
IdentifierValue(ctx.getText());
+ return null == unreservedWord ? new IdentifierValue(ctx.getText()) :
visit(unreservedWord);
}
@Override
@@ -290,7 +290,7 @@ public abstract class SQL92StatementVisitor extends
SQL92StatementBaseVisitor<AS
} else {
right = (ExpressionSegment) visit(ctx.subquery());
}
- String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
+ String operator = null == ctx.SAFE_EQ_() ?
ctx.comparisonOperator().getText() : ctx.SAFE_EQ_().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -315,7 +315,7 @@ public abstract class SQL92StatementVisitor extends
SQL92StatementBaseVisitor<AS
for (SimpleExprContext each : ctx.simpleExpr()) {
right.getItems().add((ExpressionSegment) visit(each));
}
- String operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
+ String operator = null == ctx.NOT() ? "LIKE" : "NOT LIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -524,7 +524,7 @@ public abstract class SQL92StatementVisitor extends
SQL92StatementBaseVisitor<AS
@Override
public final ASTNode visitOrderByItem(final OrderByItemContext ctx) {
- OrderDirection orderDirection = null != ctx.DESC() ?
OrderDirection.DESC : OrderDirection.ASC;
+ OrderDirection orderDirection = null == ctx.DESC() ?
OrderDirection.ASC : OrderDirection.DESC;
if (null != ctx.columnName()) {
ColumnSegment column = (ColumnSegment) visit(ctx.columnName());
return new ColumnOrderByItemSegment(column, orderDirection, null);
diff --git
a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
index be82a3f1707..bda004bdfe1 100644
---
a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
+++
b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
@@ -340,7 +340,7 @@ public final class SQL92DMLStatementVisitor extends
SQL92StatementVisitor implem
if (projection instanceof BinaryOperationExpression) {
BinaryOperationExpression binaryExpression =
(BinaryOperationExpression) projection;
int startIndex = binaryExpression.getStartIndex();
- int stopIndex = null != alias ? alias.getStopIndex() :
binaryExpression.getStopIndex();
+ int stopIndex = null == alias ? binaryExpression.getStopIndex() :
alias.getStopIndex();
ExpressionProjectionSegment result = new
ExpressionProjectionSegment(startIndex, stopIndex, binaryExpression.getText(),
binaryExpression);
result.setAlias(alias);
return result;
diff --git
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
index 942d8ef3eab..62e9d18a1b9 100644
---
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
+++
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
@@ -259,7 +259,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
@Override
public final ASTNode visitIdentifier(final IdentifierContext ctx) {
- return null != ctx.regularIdentifier() ?
visit(ctx.regularIdentifier()) : visit(ctx.delimitedIdentifier());
+ return null == ctx.regularIdentifier() ?
visit(ctx.delimitedIdentifier()) : visit(ctx.regularIdentifier());
}
@Override
@@ -405,7 +405,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
} else {
right = (ExpressionSegment) visit(ctx.subquery());
}
- String operator = null != ctx.SAFE_EQ_() ? ctx.SAFE_EQ_().getText() :
ctx.comparisonOperator().getText();
+ String operator = null == ctx.SAFE_EQ_() ?
ctx.comparisonOperator().getText() : ctx.SAFE_EQ_().getText();
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -430,7 +430,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
for (SimpleExprContext each : ctx.simpleExpr()) {
right.getItems().add((ExpressionSegment) visit(each));
}
- String operator = null != ctx.NOT() ? "NOT LIKE" : "LIKE";
+ String operator = null == ctx.NOT() ? "LIKE" : "NOT LIKE";
String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
}
@@ -645,7 +645,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
@Override
public final ASTNode visitOrderByItem(final OrderByItemContext ctx) {
- OrderDirection orderDirection = null != ctx.DESC() ?
OrderDirection.DESC : OrderDirection.ASC;
+ OrderDirection orderDirection = null == ctx.DESC() ?
OrderDirection.ASC : OrderDirection.DESC;
if (null != ctx.columnName()) {
ColumnSegment column = (ColumnSegment) visit(ctx.columnName());
return new ColumnOrderByItemSegment(column, orderDirection, null);
@@ -1164,7 +1164,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
if (projection instanceof BinaryOperationExpression) {
BinaryOperationExpression binaryExpression =
(BinaryOperationExpression) projection;
int startIndex = binaryExpression.getStartIndex();
- int stopIndex = null != alias ? alias.getStopIndex() :
binaryExpression.getStopIndex();
+ int stopIndex = null == alias ? binaryExpression.getStopIndex() :
alias.getStopIndex();
ExpressionProjectionSegment result = new
ExpressionProjectionSegment(startIndex, stopIndex, binaryExpression.getText(),
binaryExpression);
result.setAlias(alias);
return result;
diff --git
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
index 4f8d035e94b..7a108e8aa15 100644
---
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
+++
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
@@ -208,7 +208,7 @@ public final class SQLServerDCLStatementVisitor extends
SQLServerStatementVisito
}
private Optional<SimpleTableSegment> findTableSegment(final
OnClassTypeClauseContext ctx) {
- return null != ctx && null != ctx.classType() && null !=
ctx.classType().OBJECT() ? Optional.of((SimpleTableSegment)
visit(ctx.securable())) : Optional.empty();
+ return null == ctx || null == ctx.classType() || null ==
ctx.classType().OBJECT() ? Optional.empty() : Optional.of((SimpleTableSegment)
visit(ctx.securable()));
}
@Override
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/simple/ParameterMarkerExpressionSegment.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/simple/ParameterMarkerExpressionSegment.java
index b76780a648d..3c26c4ac82e 100644
---
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/simple/ParameterMarkerExpressionSegment.java
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/simple/ParameterMarkerExpressionSegment.java
@@ -78,7 +78,7 @@ public class ParameterMarkerExpressionSegment implements
SimpleExpressionSegment
@Override
public int getStopIndex() {
- return null != alias ? alias.getStopIndex() : stopIndex;
+ return null == alias ? stopIndex : alias.getStopIndex();
}
@Override
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/item/ExpressionProjectionSegment.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/item/ExpressionProjectionSegment.java
index 8a41e1646bd..f031e60d12b 100644
---
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/item/ExpressionProjectionSegment.java
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/item/ExpressionProjectionSegment.java
@@ -76,6 +76,6 @@ public final class ExpressionProjectionSegment implements
ProjectionSegment, Com
@Override
public int getStopIndex() {
- return null != alias ? alias.getStopIndex() : stopIndex;
+ return null == alias ? stopIndex : alias.getStopIndex();
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java
index cab863a736e..7ef71d693da 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java
@@ -105,7 +105,7 @@ class ImportMetaDataUpdaterTest {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getProps())
.thenReturn(new
ConfigurationProperties(PropertiesBuilder.build(new
Property(ConfigurationPropertyKey.PROXY_FRONTEND_DATABASE_PROTOCOL_TYPE.getKey(),
"MySQL"))));
- if (feature != null) {
+ if (null != feature) {
ShardingSphereDatabase database =
mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(new
ShardingSphereSchema(createTableMap(), Collections.emptyMap()));
when(database.getResourceMetaData().getStorageUnitMetaData().getDataSources()).thenReturn(createDataSourceMap());
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
index 1d2caa033b2..278777c929b 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
@@ -188,7 +188,7 @@ public final class HBaseGetResultSet implements
HBaseQueryResultSet {
@Override
public boolean next() {
- return resultNum < maxLimitResultSize && (rows.hasNext() ||
compensateResult != null);
+ return resultNum < maxLimitResultSize && (rows.hasNext() || null !=
compensateResult);
}
@Override
diff --git
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharacterSets.java
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharacterSets.java
index 54437471ec7..4399e2842eb 100644
---
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharacterSets.java
+++
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharacterSets.java
@@ -111,7 +111,7 @@ public enum PostgreSQLCharacterSets {
public static Charset findCharacterSet(final String charsetName) {
String formattedCharsetName = formatValue(charsetName);
PostgreSQLCharacterSets result =
CHARACTER_SETS_MAP.get(formattedCharsetName.toUpperCase());
- return null != result && null != result.charset ? result.charset :
Charset.forName(formattedCharsetName);
+ return null == result || null == result.charset ?
Charset.forName(formattedCharsetName) : result.charset;
}
private static String formatValue(final String value) {
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
index e86e0a3dc51..edac18be14e 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
@@ -159,7 +159,7 @@ public enum PostgreSQLCommand {
*/
private static Optional<PostgreSQLCommand> getPostgreSQLCommand(final
Class<? extends SQLStatement> sqlStatementClass) {
CachedResult result = COMPUTED_STATEMENTS.get(sqlStatementClass);
- return null != result ? result.get() :
COMPUTED_STATEMENTS.computeIfAbsent(sqlStatementClass,
PostgreSQLCommand::compute).get();
+ return null == result ?
COMPUTED_STATEMENTS.computeIfAbsent(sqlStatementClass,
PostgreSQLCommand::compute).get() : result.get();
}
private static CachedResult compute(final Class<? extends SQLStatement>
target) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/expression/ExpressionAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/expression/ExpressionAssert.java
index 22d628ca1d5..a5316dd8919 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/expression/ExpressionAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/expression/ExpressionAssert.java
@@ -330,7 +330,7 @@ public final class ExpressionAssert {
while (expectedIterator.hasNext()) {
ExpressionAssert.assertExpression(assertContext,
actualIterator.next(), expectedIterator.next());
}
- if (expected.getOwner() != null) {
+ if (null != expected.getOwner()) {
OwnerAssert.assertIs(assertContext, actual.getOwner(),
expected.getOwner());
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
index 0e0d29775f9..257fe519796 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
@@ -161,9 +161,8 @@ public final class ProjectionAssert {
String expectedText = SQLCaseType.LITERAL ==
assertContext.getCaseType() && null != expected.getLiteralText()
? expected.getLiteralText()
: expected.getText();
- assertThat(assertContext.getText("Expression projection text assertion
error: "),
- actual.getText(), is(expectedText));
- if (expected.getExpr() != null) {
+ assertThat(assertContext.getText("Expression projection text assertion
error: "), actual.getText(), is(expectedText));
+ if (null != expected.getExpr()) {
ExpressionAssert.assertExpression(assertContext, actual.getExpr(),
expected.getExpr());
}
}
