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 591d041e345 Rewrite `== null` to `null ==` (#20939)
591d041e345 is described below
commit 591d041e345e6263639ad4648ef666dd458692be
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Sep 12 21:19:28 2022 +0800
Rewrite `== null` to `null ==` (#20939)
* Rewrite `== null` to `null ==`
* Rewrite `== null` to `null ==`
* Rewrite `== null` to `null ==`
---
...cal_Guide_to_Apache_ShardingSphere's_HINT.en.md | 2 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 2 +-
.../protocol/mysql/constant/MySQLServerInfo.java | 5 +----
.../PostgreSQLAggregatedCommandPacket.java | 7 +++---
.../bind/protocol/PostgreSQLByteConverter.java | 26 +++++++++++-----------
...adwriteSplittingRuleStatementConverterTest.java | 6 ++---
.../algorithm/shadow/hint/ShadowHintExtractor.java | 4 ++--
.../shardingsphere/shadow/rule/ShadowRule.java | 2 +-
.../metadata/dialect/H2DataSourceMetaData.java | 2 +-
.../type/memory/loader/AbstractJDBCRowsLoader.java | 2 +-
.../data/pipeline/api/metadata/IdentifierName.java | 2 +-
.../api/metadata/model/PipelineColumnMetaData.java | 2 +-
.../api/metadata/model/PipelineTableMetaData.java | 5 ++---
.../scenario/migration/MigrationJobPreparer.java | 2 +-
.../ingest/PostgreSQLColumnValueReader.java | 2 +-
.../translatable/TranslatableTableScan.java | 6 ++---
.../distsql/ral/hint/HintManagerHolder.java | 2 +-
.../impl/SQLServerStatementSQLVisitor.java | 3 +--
18 files changed, 37 insertions(+), 45 deletions(-)
diff --git
a/docs/blog/content/material/2022_04_13_A_Practical_Guide_to_Apache_ShardingSphere's_HINT.en.md
b/docs/blog/content/material/2022_04_13_A_Practical_Guide_to_Apache_ShardingSphere's_HINT.en.md
index ea70231ed01..0f66d96da19 100644
---
a/docs/blog/content/material/2022_04_13_A_Practical_Guide_to_Apache_ShardingSphere's_HINT.en.md
+++
b/docs/blog/content/material/2022_04_13_A_Practical_Guide_to_Apache_ShardingSphere's_HINT.en.md
@@ -347,7 +347,7 @@ public final class HintManagerHolder {
* @return hint manager
*/
public static HintManager get() {
- if (HINT_MANAGER_HOLDER.get() == null) {
+ if (null == HINT_MANAGER_HOLDER.get()) {
HINT_MANAGER_HOLDER.set(HintManager.getInstance());
}
return HINT_MANAGER_HOLDER.get();
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
index a8e867acf31..1d41a483dad 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
@@ -53,7 +53,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
Span span = COLLECTOR.pop();
assertThat(span.name(),
is("/ShardingSphere/executeSQL/".toLowerCase()));
Map<String, String> tags = span.tags();
- assertFalse(tags == null || tags.isEmpty());
+ assertFalse(null == tags || tags.isEmpty());
assertThat(tags.get(ZipkinConstants.Tags.COMPONENT),
is("shardingsphere"));
assertThat(tags.get(ZipkinConstants.Tags.DB_INSTANCE), is("mock.db"));
assertThat(tags.get(ZipkinConstants.Tags.DB_STATEMENT), is("select
1"));
diff --git
a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
index 9bd8aaa796e..5a034a47106 100644
---
a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
+++
b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
@@ -60,10 +60,7 @@ public final class MySQLServerInfo {
* @return server version
*/
public static String getServerVersion(final String databaseName) {
- if (databaseName == null) {
- return getDefaultServerVersion();
- }
- return SERVER_VERSIONS.getOrDefault(databaseName,
getDefaultServerVersion());
+ return null == databaseName ? getDefaultServerVersion() :
SERVER_VERSIONS.getOrDefault(databaseName, getDefaultServerVersion());
}
/**
diff --git
a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/PostgreSQLAggregatedCommandPacket.java
b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/PostgreSQLAggregatedCommandPacket.java
index a7211a93f98..a5cbb79f226 100644
---
a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/PostgreSQLAggregatedCommandPacket.java
+++
b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/PostgreSQLAggregatedCommandPacket.java
@@ -17,6 +17,7 @@
package
org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended;
+import com.google.common.base.Preconditions;
import lombok.Getter;
import lombok.ToString;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.PostgreSQLCommandPacket;
@@ -56,7 +57,7 @@ public final class PostgreSQLAggregatedCommandPacket extends
PostgreSQLCommandPa
if (++parseTimes > 1) {
break;
}
- if (firstStatement == null) {
+ if (null == firstStatement) {
firstStatement = ((PostgreSQLComParsePacket)
each).getStatementId();
} else if (!firstStatement.equals(((PostgreSQLComParsePacket)
each).getStatementId())) {
break;
@@ -99,9 +100,7 @@ public final class PostgreSQLAggregatedCommandPacket extends
PostgreSQLCommandPa
}
private void ensureRandomAccessible(final List<PostgreSQLCommandPacket>
packets) {
- if (!(packets instanceof RandomAccess)) {
- throw new IllegalArgumentException("Packets must be
RandomAccess.");
- }
+ Preconditions.checkArgument(packets instanceof RandomAccess, "Packets
must be RandomAccess.");
}
@Override
diff --git
a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
index c814e347c5b..751d7eed635 100644
---
a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
+++
b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
@@ -235,14 +235,14 @@ public final class PostgreSQLByteConverter {
idx += 2;
d = readShort2(bytes, idx);
if (effectiveScale >= 4) {
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt *= 10000;
} else {
unscaledBI = unscaledBI.multiply(BI_TEN_THOUSAND);
}
effectiveScale -= 4;
} else {
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt *= INT_TEN_POWERS[effectiveScale];
} else {
unscaledBI = unscaledBI.multiply(tenPower(effectiveScale));
@@ -250,7 +250,7 @@ public final class PostgreSQLByteConverter {
d = (short) (d / INT_TEN_POWERS[4 - effectiveScale]);
effectiveScale = 0;
}
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt += d;
} else {
if (d != 0) {
@@ -258,13 +258,13 @@ public final class PostgreSQLByteConverter {
}
}
}
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledBI = BigInteger.valueOf(unscaledInt);
}
if (effectiveScale > 0) {
unscaledBI = unscaledBI.multiply(tenPower(effectiveScale));
}
- if (sign == NUMERIC_NEG) {
+ if (NUMERIC_NEG == sign) {
unscaledBI = unscaledBI.negate();
}
return new BigDecimal(unscaledBI, scale);
@@ -281,7 +281,7 @@ public final class PostgreSQLByteConverter {
}
idx += 2;
d = readShort2(bytes, idx);
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt *= 10000;
unscaledInt += d;
} else {
@@ -291,10 +291,10 @@ public final class PostgreSQLByteConverter {
}
}
}
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledBI = BigInteger.valueOf(unscaledInt);
}
- if (sign == NUMERIC_NEG) {
+ if (NUMERIC_NEG == sign) {
unscaledBI = unscaledBI.negate();
}
final int bigDecScale = (len - (weight + 1)) * 4;
@@ -316,20 +316,20 @@ public final class PostgreSQLByteConverter {
d = readShort2(bytes, idx);
if (effectiveWeight > 0) {
--effectiveWeight;
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt *= 10000;
} else {
unscaledBI = unscaledBI.multiply(BI_TEN_THOUSAND);
}
} else if (effectiveScale >= 4) {
effectiveScale -= 4;
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt *= 10000;
} else {
unscaledBI = unscaledBI.multiply(BI_TEN_THOUSAND);
}
} else {
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt *= INT_TEN_POWERS[effectiveScale];
} else {
unscaledBI = unscaledBI.multiply(tenPower(effectiveScale));
@@ -337,7 +337,7 @@ public final class PostgreSQLByteConverter {
d = (short) (d / INT_TEN_POWERS[4 - effectiveScale]);
effectiveScale = 0;
}
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledInt += d;
} else {
if (d != 0) {
@@ -345,7 +345,7 @@ public final class PostgreSQLByteConverter {
}
}
}
- if (unscaledBI == null) {
+ if (null == unscaledBI) {
unscaledBI = BigInteger.valueOf(unscaledInt);
}
if (effectiveWeight > 0) {
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphe
[...]
index 020ead5804c..e684c3774f2 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java
@@ -33,7 +33,6 @@ import java.util.Properties;
import java.util.stream.Stream;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
@@ -93,9 +92,8 @@ public final class
ReadwriteSplittingRuleStatementConverterTest {
String expectedLoadBalancerName = String.format("%s_%s",
expectedReadwriteSplittingRuleSegment.getName(),
expectedReadwriteSplittingRuleSegment.getLoadBalancer());
assertThat(actualRuleConfig.getLoadBalancerName(),
is(expectedLoadBalancerName));
assertThat(getWriteDataSourceName(actualRuleConfig),
is(expectedReadwriteSplittingRuleSegment.getWriteDataSource()));
- assertThat(getReadDataSourceNames(actualRuleConfig),
equalTo(expectedReadwriteSplittingRuleSegment.getReadDataSources() == null
- ? Collections.emptyList()
- :
expectedReadwriteSplittingRuleSegment.getReadDataSources()));
+ assertThat(getReadDataSourceNames(actualRuleConfig), is(
+ null ==
expectedReadwriteSplittingRuleSegment.getReadDataSources() ?
Collections.emptyList() :
expectedReadwriteSplittingRuleSegment.getReadDataSources()));
assertTrue(actualMultipleRuleSegmentConvertResultLoadBalancers.containsKey(expectedLoadBalancerName));
AlgorithmConfiguration actualSphereAlgorithmConfig =
actualMultipleRuleSegmentConvertResultLoadBalancers.get(actualRuleConfig.getLoadBalancerName());
assertThat(actualSphereAlgorithmConfig.getType(),
containsString(expectedReadwriteSplittingRuleSegment.getLoadBalancer()));
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/ShadowHintExtractor.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/ShadowHintExtractor.java
index 87f0b2543bb..2569d52078b 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/ShadowHintExtractor.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/ShadowHintExtractor.java
@@ -104,8 +104,8 @@ public final class ShadowHintExtractor {
}
private static boolean isBlank(final String noteValue) {
- final int strLen = noteValue == null ? 0 : noteValue.length();
- if (strLen == 0) {
+ final int strLen = null == noteValue ? 0 : noteValue.length();
+ if (0 == strLen) {
return true;
}
for (int i = 0; i < strLen; i++) {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
index bf07b0b925e..19574fd8a30 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
@@ -255,7 +255,7 @@ public final class ShadowRule implements DatabaseRule,
DataSourceContainedRule {
*/
public Optional<String> getSourceDataSourceName(final String
actualDataSourceName) {
ShadowDataSourceRule shadowDataSourceRule =
shadowDataSourceMappings.get(actualDataSourceName);
- return shadowDataSourceRule == null ? Optional.empty() :
Optional.of(shadowDataSourceRule.getProductionDataSource());
+ return null == shadowDataSourceRule ? Optional.empty() :
Optional.of(shadowDataSourceRule.getProductionDataSource());
}
@Override
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
index 9c3bce9773a..2a3312e8af7 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/metadata/dialect/H2DataSourceMetaData.java
@@ -77,7 +77,7 @@ public final class H2DataSourceMetaData implements
DataSourceMetaData {
String modelMemFromMatcher = matcher.group("modelMem");
String modelSslOrTcpFromMatcher = matcher.group("modelSslOrTcp");
String modelFileFromMatcher = matcher.group("modelFile");
- if (modelMemFromMatcher == null) {
+ if (null == modelMemFromMatcher) {
model = null == modelSslOrTcpFromMatcher ? modelFileFromMatcher :
modelSslOrTcpFromMatcher;
} else {
model = modelMemFromMatcher;
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/loader/AbstractJDBCRowsLoader.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/loader/AbstractJDBCRowsLoader.java
index ff94c16cec0..e3d4c996f7d 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/loader/AbstractJDBCRowsLoader.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/memory/loader/AbstractJDBCRowsLoader.java
@@ -67,7 +67,7 @@ public abstract class AbstractJDBCRowsLoader implements
JDBCRowsLoader {
return resultSet.getLong(columnIndex);
}
BigDecimal bigDecimal = resultSet.getBigDecimal(columnIndex);
- return bigDecimal == null ? null : bigDecimal.toBigInteger();
+ return null == bigDecimal ? null : bigDecimal.toBigInteger();
case Types.NUMERIC:
case Types.DECIMAL:
return resultSet.getBigDecimal(columnIndex);
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
index f67c76ab003..970cb243b66 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/IdentifierName.java
@@ -44,7 +44,7 @@ public class IdentifierName {
if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (null == o || getClass() != o.getClass()) {
return false;
}
final IdentifierName tableName = (IdentifierName) o;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineColumnMetaData.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineColumnMetaData.java
index ccc001cf6c1..09f465afdd6 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineColumnMetaData.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineColumnMetaData.java
@@ -50,7 +50,7 @@ public final class PipelineColumnMetaData implements
Comparable<PipelineColumnMe
if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (null == o || getClass() != o.getClass()) {
return false;
}
final PipelineColumnMetaData that = (PipelineColumnMetaData) o;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
index c35eb8f463f..c6ee518cb18 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/model/PipelineTableMetaData.java
@@ -105,11 +105,10 @@ public final class PipelineTableMetaData {
if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (null == o || getClass() != o.getClass()) {
return false;
}
- final PipelineTableMetaData that = (PipelineTableMetaData) o;
- return name.equals(that.name);
+ return name.equals(((PipelineTableMetaData) o).name);
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
index 63a94777d93..1b898f34e0c 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
@@ -154,7 +154,7 @@ public final class MigrationJobPreparer {
ExecuteEngine incrementalDumperExecuteEngine =
jobItemContext.getJobProcessContext().getIncrementalDumperExecuteEngine();
MigrationTaskConfiguration taskConfig = jobItemContext.getTaskConfig();
PipelineDataSourceManager dataSourceManager =
jobItemContext.getDataSourceManager();
- JobItemIncrementalTasksProgress initIncremental =
jobItemContext.getInitProgress() == null ? null :
jobItemContext.getInitProgress().getIncremental();
+ JobItemIncrementalTasksProgress initIncremental = null ==
jobItemContext.getInitProgress() ? null :
jobItemContext.getInitProgress().getIncremental();
taskConfig.getDumperConfig().setPosition(PipelineJobPreparerUtils.getIncrementalPosition(initIncremental,
taskConfig.getDumperConfig(), dataSourceManager));
PipelineTableMetaDataLoader sourceMetaDataLoader =
jobItemContext.getSourceMetaDataLoader();
DefaultPipelineJobProgressListener jobProgressListener = new
DefaultPipelineJobProgressListener(jobItemContext.getJobId(),
jobItemContext.getShardingItem());
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java
index f0c4c6ed0f1..cf748415ca8 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLColumnValueReader.java
@@ -47,7 +47,7 @@ public final class PostgreSQLColumnValueReader extends
BasicColumnValueReader {
PGobject result = new PGobject();
result.setType("bit");
Object resultSetObject = resultSet.getObject(columnIndex);
- if (resultSetObject == null) {
+ if (null == resultSetObject) {
result.setValue(null);
} else {
result.setValue((Boolean) resultSetObject ? "1" : "0");
diff --git
a/shardingsphere-kernel/shardingsphere-sql-federation/shardingsphere-sql-federation-optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableTableScan.java
b/shardingsphere-kernel/shardingsphere-sql-federation/shardingsphere-sql-federation-optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableTableScan.java
index 5d6c4a4f4d5..be759e90bec 100644
---
a/shardingsphere-kernel/shardingsphere-sql-federation/shardingsphere-sql-federation-optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableTableScan.java
+++
b/shardingsphere-kernel/shardingsphere-sql-federation/shardingsphere-sql-federation-optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/translatable/TranslatableTableScan.java
@@ -166,8 +166,8 @@ public class TranslatableTableScan extends TableScan
implements EnumerableRel {
return implementor.result(physType,
Blocks.toBlock(Expressions.call(table.getExpression(FederationTranslatableTable.class),
"projectAndFilter", implementor.getRootExpression(),
Expressions.constant(filterValues), Expressions.constant(fields))));
}
- return implementor.result(physType,
Blocks.toBlock(Expressions.call(table.getExpression(FederationTranslatableTable.class),
- "project", implementor.getRootExpression(),
Expressions.constant(fields))));
+ return implementor.result(physType, Blocks.toBlock(
+
Expressions.call(table.getExpression(FederationTranslatableTable.class),
"project", implementor.getRootExpression(), Expressions.constant(fields))));
}
private boolean addFilter(final List<RexNode> filters, final String[]
filterValues) {
@@ -185,7 +185,7 @@ public class TranslatableTableScan extends TableScan
implements EnumerableRel {
continue;
}
int index = ((RexInputRef) left).getIndex();
- if (filterValues[index] == null) {
+ if (null == filterValues[index]) {
filterValues[index] = ((RexLiteral)
right).getValue2().toString();
return true;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintManagerHolder.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintManagerHolder.java
index 2594ff657fd..d0369478b3a 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintManagerHolder.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/hint/HintManagerHolder.java
@@ -35,7 +35,7 @@ public final class HintManagerHolder {
* @return hint manager
*/
public static HintManager get() {
- if (HINT_MANAGER_HOLDER.get() == null) {
+ if (null == HINT_MANAGER_HOLDER.get()) {
HINT_MANAGER_HOLDER.set(HintManager.getInstance());
}
return HINT_MANAGER_HOLDER.get();
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
index f08d8ae0f1b..eda4c1a9421 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
@@ -1105,8 +1105,7 @@ public abstract class SQLServerStatementSQLVisitor
extends SQLServerStatementBas
AliasSegment alias = null == ctx.alias() ? null : (AliasSegment)
visit(ctx.alias());
if (null != ctx.top()) {
RowNumberValueSegment rowNumber = (RowNumberValueSegment)
visit(ctx.top());
- return new
TopProjectionSegment(ctx.top().getStart().getStartIndex(),
ctx.top().getStop().getStopIndex(), rowNumber,
- alias == null ? null : alias.getIdentifier().getValue());
+ return new
TopProjectionSegment(ctx.top().getStart().getStartIndex(),
ctx.top().getStop().getStopIndex(), rowNumber, null == alias ? null :
alias.getIdentifier().getValue());
}
if (null != ctx.columnName()) {
ColumnSegment column = (ColumnSegment) visit(ctx.columnName());