You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/10/11 11:07:36 UTC
[shardingsphere] branch master updated: Remove @Data (#21502)
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 72df77c1c32 Remove @Data (#21502)
72df77c1c32 is described below
commit 72df77c1c32efff97335f1b9c76a7b7fcb7ac6af
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Oct 11 19:07:27 2022 +0800
Remove @Data (#21502)
---
.../yaml/YamlConsistencyCheckJobProgress.java | 6 +++--
.../ConsistencyCheckJobAPIImpl.java | 7 ++----
.../YamlDataConsistencyCheckResult.java | 28 ++++++++++------------
.../YamlDataConsistencyCheckResultSwapper.java | 3 ++-
.../yaml/metadata/YamlPipelineColumnMetaData.java | 10 ++++----
.../process/YamlPipelineReadConfiguration.java | 6 +++--
.../process/YamlPipelineWriteConfiguration.java | 6 +++--
.../agent/test/metrics/result/MetricResult.java | 14 +++++++----
.../test/opentelemetry/result/TracingResult.java | 8 ++++---
.../engine/command/CommonSQLCommand.java | 6 +++--
.../transaction/engine/entity/JdbcInfoEntity.java | 4 ++--
11 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/yaml/YamlConsistencyCheckJobProgress.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/yaml/YamlConsistencyCheckJobProgress.java
index d915fce6a1a..b5d1940ddfb 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/yaml/YamlConsistencyCheckJobProgress.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/progress/yaml/YamlConsistencyCheckJobProgress.java
@@ -17,13 +17,15 @@
package org.apache.shardingsphere.data.pipeline.core.job.progress.yaml;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
* Yaml data consistency check job progress.
*/
-@Data
+@Getter
+@Setter
public final class YamlConsistencyCheckJobProgress implements YamlConfiguration {
private String status;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
index 41e3cfe365d..fa2b7d9ebd7 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.data.pipeline.scenario.consistencycheck;
+import com.google.common.base.Strings;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCheckResult;
import org.apache.shardingsphere.data.pipeline.api.config.PipelineTaskConfiguration;
import org.apache.shardingsphere.data.pipeline.api.config.job.ConsistencyCheckJobConfiguration;
@@ -127,10 +127,7 @@ public final class ConsistencyCheckJobAPIImpl extends AbstractPipelineJobAPIImpl
@Override
public ConsistencyCheckJobProgress getJobItemProgress(final String jobId, final int shardingItem) {
String progress = PipelineAPIFactory.getGovernanceRepositoryAPI().getJobItemProgress(jobId, shardingItem);
- if (StringUtils.isBlank(progress)) {
- return null;
- }
- return swapper.swapToObject(YamlEngine.unmarshal(progress, YamlConsistencyCheckJobProgress.class, true));
+ return Strings.isNullOrEmpty(progress) ? null : swapper.swapToObject(YamlEngine.unmarshal(progress, YamlConsistencyCheckJobProgress.class, true));
}
@Override
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResult.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResult.java
index 24bda01438b..2e5f5aac696 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResult.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResult.java
@@ -17,17 +17,15 @@
package org.apache.shardingsphere.data.pipeline.yaml.consistency;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
* Yaml data consistency check result config.
*/
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
+@Getter
+@Setter
public final class YamlDataConsistencyCheckResult implements YamlConfiguration {
private YamlDataConsistencyCountCheckResult countCheckResult;
@@ -35,12 +33,11 @@ public final class YamlDataConsistencyCheckResult implements YamlConfiguration {
private YamlDataConsistencyContentCheckResult contentCheckResult;
/**
- * Yaml data consistency count result.
+ * YAML data consistency count result.
*/
- @Data
- @NoArgsConstructor
- @AllArgsConstructor
- public static class YamlDataConsistencyCountCheckResult {
+ @Getter
+ @Setter
+ public static class YamlDataConsistencyCountCheckResult implements YamlConfiguration {
private long sourceRecordsCount;
@@ -50,12 +47,11 @@ public final class YamlDataConsistencyCheckResult implements YamlConfiguration {
}
/**
- * Yaml data consistency content result.
+ * YAML data consistency content result.
*/
- @Data
- @NoArgsConstructor
- @AllArgsConstructor
- public static class YamlDataConsistencyContentCheckResult {
+ @Getter
+ @Setter
+ public static class YamlDataConsistencyContentCheckResult implements YamlConfiguration {
private boolean matched;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java
index e9cd188e80e..b2204ae26ae 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java
@@ -38,7 +38,8 @@ public final class YamlDataConsistencyCheckResultSwapper implements YamlConfigur
countCheckResult.setMatched(data.getContentCheckResult().isMatched());
YamlDataConsistencyCheckResult result = new YamlDataConsistencyCheckResult();
result.setCountCheckResult(countCheckResult);
- YamlDataConsistencyContentCheckResult contentCheckResult = new YamlDataConsistencyContentCheckResult(data.getContentCheckResult().isMatched());
+ YamlDataConsistencyContentCheckResult contentCheckResult = new YamlDataConsistencyContentCheckResult();
+ contentCheckResult.setMatched(data.getContentCheckResult().isMatched());
result.setContentCheckResult(contentCheckResult);
return result;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/metadata/YamlPipelineColumnMetaData.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/metadata/YamlPipelineColumnMetaData.java
index c4a96dc64e4..91ac24a0922 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/metadata/YamlPipelineColumnMetaData.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/metadata/YamlPipelineColumnMetaData.java
@@ -17,17 +17,15 @@
package org.apache.shardingsphere.data.pipeline.yaml.metadata;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
* Yaml pipeline column meta data.
*/
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
+@Getter
+@Setter
public final class YamlPipelineColumnMetaData implements YamlConfiguration {
private int ordinalPosition;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineReadConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineReadConfiguration.java
index 4f3e6754a95..6d8101bd342 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineReadConfiguration.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineReadConfiguration.java
@@ -17,14 +17,16 @@
package org.apache.shardingsphere.data.pipeline.yaml.process;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
/**
* YAML pipeline read configuration.
*/
-@Data
+@Getter
+@Setter
public final class YamlPipelineReadConfiguration implements YamlConfiguration {
private static final Integer DEFAULT_WORKER_THREAD = 40;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineWriteConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineWriteConfiguration.java
index 4fe4256ff55..c5d6cc193aa 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineWriteConfiguration.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/process/YamlPipelineWriteConfiguration.java
@@ -17,14 +17,16 @@
package org.apache.shardingsphere.data.pipeline.yaml.process;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
/**
* YAML pipeline write configuration.
*/
-@Data
+@Getter
+@Setter
public final class YamlPipelineWriteConfiguration implements YamlConfiguration {
private static final Integer DEFAULT_WORKER_THREAD = 40;
diff --git a/test/integration-agent-test/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java b/test/integration-agent-test/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java
index 2a24ac4309d..42f62975bc6 100644
--- a/test/integration-agent-test/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java
+++ b/test/integration-agent-test/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java
@@ -17,19 +17,23 @@
package org.apache.shardingsphere.integration.agent.test.metrics.result;
+import lombok.Getter;
+import lombok.Setter;
+
import java.util.List;
import java.util.Map;
-import lombok.Data;
-@Data
-public class MetricResult {
+@Getter
+@Setter
+public final class MetricResult {
private String status;
private Map<String, List<Metric>> data;
- @Data
- public static class Metric {
+ @Getter
+ @Setter
+ public static final class Metric {
private String type;
diff --git a/test/integration-agent-test/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java b/test/integration-agent-test/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java
index bb937c83f39..fbeb0631780 100644
--- a/test/integration-agent-test/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java
+++ b/test/integration-agent-test/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java
@@ -17,12 +17,14 @@
package org.apache.shardingsphere.integration.agent.test.opentelemetry.result;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import java.util.Map;
-@Data
-public class TracingResult {
+@Getter
+@Setter
+public final class TracingResult {
private String traceId;
diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/command/CommonSQLCommand.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/command/CommonSQLCommand.java
index ed455128c49..8b856e64d2b 100644
--- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/command/CommonSQLCommand.java
+++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/command/CommonSQLCommand.java
@@ -17,16 +17,18 @@
package org.apache.shardingsphere.integration.transaction.engine.command;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-@Data
@XmlRootElement(name = "command")
@XmlAccessorType(XmlAccessType.FIELD)
+@Getter
+@Setter
public final class CommonSQLCommand {
@XmlElement(name = "create-database-sharding-algorithm")
diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/entity/JdbcInfoEntity.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/entity/JdbcInfoEntity.java
index 49f18a025ce..c27feab99dc 100644
--- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/entity/JdbcInfoEntity.java
+++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/entity/JdbcInfoEntity.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.integration.transaction.engine.entity;
-import lombok.Data;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* JDBC info entity.
*/
@RequiredArgsConstructor
-@Data
+@Getter
public final class JdbcInfoEntity {
private final String username;