This is an automated email from the ASF dual-hosted git repository.
yx9o 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 f623ff9f728 Remove useless @NonNull (#21534)
f623ff9f728 is described below
commit f623ff9f7284a869496696a087afff8f47bf758d
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Oct 13 00:04:49 2022 +0800
Remove useless @NonNull (#21534)
---
.../data/pipeline/api/PipelineJobPublicAPIFactory.java | 3 +--
.../shardingsphere/data/pipeline/api/metadata/TableName.java | 4 +---
.../algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java | 10 +++++-----
.../algorithm/DataMatchDataConsistencyCalculateAlgorithm.java | 5 ++++-
.../data/pipeline/core/job/AbstractPipelineJobId.java | 5 +----
.../scenario/consistencycheck/ConsistencyCheckJobId.java | 8 +++-----
6 files changed, 15 insertions(+), 20 deletions(-)
diff --git
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPIFactory.java
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPIFactory.java
index 725630e86cc..315dc17ae28 100644
---
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPIFactory.java
+++
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/PipelineJobPublicAPIFactory.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.data.pipeline.api;
-import lombok.NonNull;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import
org.apache.shardingsphere.infra.util.spi.type.required.RequiredSPIRegistry;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPIRegistry;
@@ -39,7 +38,7 @@ public final class PipelineJobPublicAPIFactory {
* @param jobTypeName job type name
* @return got instance
*/
- public static InventoryIncrementalJobPublicAPI
getInventoryIncrementalJobPublicAPI(@NonNull final String jobTypeName) {
+ public static InventoryIncrementalJobPublicAPI
getInventoryIncrementalJobPublicAPI(final String jobTypeName) {
return
TypedSPIRegistry.getRegisteredService(InventoryIncrementalJobPublicAPI.class,
jobTypeName);
}
diff --git
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/TableName.java
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/TableName.java
index b7b0f5f9428..3113eee00a9 100644
---
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/TableName.java
+++
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/metadata/TableName.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.data.pipeline.api.metadata;
-import lombok.NonNull;
-
/**
* Table name.
*
@@ -27,7 +25,7 @@ import lombok.NonNull;
*/
public class TableName extends IdentifierName {
- public TableName(@NonNull final String tableName) {
+ public TableName(final String tableName) {
super(tableName);
}
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
index 230298808c9..493e006f77a 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
@@ -18,7 +18,6 @@
package
org.apache.shardingsphere.data.pipeline.core.check.consistency.algorithm;
import lombok.Getter;
-import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCalculateParameter;
@@ -117,11 +116,13 @@ public final class
CRC32MatchDataConsistencyCalculateAlgorithm extends AbstractD
private final int recordsCount;
- @NonNull
private final Collection<Long> columnsCrc32;
@Override
- public boolean equals(final @NonNull Object o) {
+ public boolean equals(final Object o) {
+ if (null == o) {
+ return false;
+ }
if (this == o) {
return true;
}
@@ -137,9 +138,8 @@ public final class
CRC32MatchDataConsistencyCalculateAlgorithm extends AbstractD
if (!columnsCrc32.equals(that.columnsCrc32)) {
log.info("columnsCrc32 not match, columnsCrc32={},
that.columnsCrc32={}", columnsCrc32, that.columnsCrc32);
return false;
- } else {
- return true;
}
+ return true;
}
@Override
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
index a2df6b70b79..1415cee9d0c 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
@@ -168,7 +168,10 @@ public final class
DataMatchDataConsistencyCalculateAlgorithm extends AbstractSt
@SneakyThrows(SQLException.class)
@Override
- public boolean equals(final @NonNull Object o) {
+ public boolean equals(final Object o) {
+ if (null == o) {
+ return false;
+ }
if (this == o) {
return true;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJobId.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJobId.java
index 8f33cbc34ce..762eb3eeb79 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJobId.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractPipelineJobId.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.data.pipeline.core.job;
import com.google.common.base.Preconditions;
import lombok.Getter;
-import lombok.NonNull;
import lombok.ToString;
import org.apache.shardingsphere.data.pipeline.api.job.JobType;
import org.apache.shardingsphere.data.pipeline.api.job.PipelineJobId;
@@ -31,13 +30,11 @@ import
org.apache.shardingsphere.data.pipeline.api.job.PipelineJobId;
@ToString
public abstract class AbstractPipelineJobId implements PipelineJobId {
- @NonNull
private final JobType jobType;
- @NonNull
private final String formatVersion;
- public AbstractPipelineJobId(@NonNull final JobType jobType, @NonNull
final String formatVersion) {
+ public AbstractPipelineJobId(final JobType jobType, final String
formatVersion) {
this.jobType = jobType;
Preconditions.checkArgument(2 == formatVersion.length(),
"formatVersion length is not 2");
this.formatVersion = formatVersion;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobId.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobId.java
index 727d83dedb6..e57f6db643e 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobId.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobId.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.data.pipeline.scenario.consistencycheck;
import lombok.Getter;
-import lombok.NonNull;
import lombok.ToString;
import org.apache.shardingsphere.data.pipeline.api.job.JobType;
import org.apache.shardingsphere.data.pipeline.core.job.AbstractPipelineJobId;
@@ -40,7 +39,7 @@ public final class ConsistencyCheckJobId extends
AbstractPipelineJobId {
private final int sequence;
- public ConsistencyCheckJobId(final @NonNull String parentJobId, final int
sequence) {
+ public ConsistencyCheckJobId(final String parentJobId, final int sequence)
{
super(JobType.CONSISTENCY_CHECK, CURRENT_VERSION);
this.parentJobId = parentJobId;
this.sequence = sequence > MAX_SEQUENCE ? MIN_SEQUENCE : sequence;
@@ -52,8 +51,7 @@ public final class ConsistencyCheckJobId extends
AbstractPipelineJobId {
* @param checkJobId consistency check job id
* @return sequence
*/
- public static int parseSequence(final @NonNull String checkJobId) {
- String versionString = checkJobId.substring(checkJobId.length() - 1);
- return Integer.parseInt(versionString);
+ public static int parseSequence(final String checkJobId) {
+ return Integer.parseInt(checkJobId.substring(checkJobId.length() - 1));
}
}
