This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new a72ba6091 [INLONG-3636][Manager] Fix the warning logs during the build
(#4126)
a72ba6091 is described below
commit a72ba60918005a394e2f045c08b73a65b1ce2892
Author: haibo.duan <[email protected]>
AuthorDate: Sun May 8 15:35:09 2022 +0800
[INLONG-3636][Manager] Fix the warning logs during the build (#4126)
---
.../main/java/org/apache/inlong/manager/client/cli/util/PrintUtil.java | 3 +--
.../java/org/apache/inlong/manager/client/api/FlinkSortBaseConf.java | 2 ++
.../main/java/org/apache/inlong/manager/client/api/TubeBaseConf.java | 2 ++
.../java/org/apache/inlong/manager/client/api/UserDefinedSortConf.java | 2 ++
.../apache/inlong/manager/common/pojo/consumption/ConsumptionInfo.java | 1 +
.../apache/inlong/manager/common/pojo/group/InlongGroupRequest.java | 3 +++
.../org/apache/inlong/manager/common/pojo/pulsar/PulsarTopicBean.java | 1 +
.../inlong/manager/common/pojo/source/binlog/BinlogSourceDTO.java | 2 ++
.../apache/inlong/manager/common/pojo/stream/InlongStreamResponse.java | 1 +
.../org/apache/inlong/manager/common/pojo/stream/StreamTransform.java | 2 ++
.../common/pojo/transform/deduplication/DeDuplicationDefinition.java | 2 ++
.../inlong/manager/common/pojo/transform/filter/FilterDefinition.java | 2 ++
.../inlong/manager/common/pojo/transform/joiner/JoinerDefinition.java | 2 ++
.../common/pojo/transform/replacer/StringReplacerDefinition.java | 2 ++
.../manager/common/pojo/transform/splitter/SplitterDefinition.java | 2 ++
.../org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java | 3 +++
.../org/apache/inlong/manager/workflow/definition/WorkflowProcess.java | 2 +-
17 files changed, 31 insertions(+), 3 deletions(-)
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtil.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtil.java
index eede64947..2b8b36ec0 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtil.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtil.java
@@ -47,8 +47,7 @@ public class PrintUtil {
public static <T> void printJson(T item) {
Gson gson = new GsonBuilder().setPrettyPrinting().create();
- JsonParser jsonParser = new JsonParser();
- JsonObject jsonObject =
jsonParser.parse(gson.toJson(item)).getAsJsonObject();
+ JsonObject jsonObject =
JsonParser.parseString(gson.toJson(item)).getAsJsonObject();
System.out.println(gson.toJson(jsonObject));
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/FlinkSortBaseConf.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/FlinkSortBaseConf.java
index 0cced823e..e65150423 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/FlinkSortBaseConf.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/FlinkSortBaseConf.java
@@ -21,11 +21,13 @@ import com.google.common.collect.Maps;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.client.api.auth.Authentication;
import java.util.Map;
@Data
+@EqualsAndHashCode(callSuper = true)
@ApiModel("Base configuration for flink cluster")
public class FlinkSortBaseConf extends SortBaseConf {
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TubeBaseConf.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TubeBaseConf.java
index 7a8dccf51..fc0934d39 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TubeBaseConf.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TubeBaseConf.java
@@ -21,10 +21,12 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.common.enums.MQType;
@Data
+@EqualsAndHashCode(callSuper = true)
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("Base configuration for Tube")
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/UserDefinedSortConf.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/UserDefinedSortConf.java
index fd1756bb5..8bb09a51e 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/UserDefinedSortConf.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/UserDefinedSortConf.java
@@ -21,10 +21,12 @@ import com.google.common.collect.Maps;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Map;
@Data
+@EqualsAndHashCode(callSuper = true)
@ApiModel("Base configuration for user defined sort functions")
public class UserDefinedSortConf extends SortBaseConf {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionInfo.java
index e46ab36ed..397789e85 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionInfo.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionInfo.java
@@ -70,6 +70,7 @@ public class ConsumptionInfo {
private String masterUrl;
@ApiModelProperty(value = "whether to filter consumption, 0: not filter,
1: filter")
+ @Builder.Default
private Integer filterEnabled = 0;
@ApiModelProperty(value = "consumption target inlong stream id")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
index 494678913..eb2db53e3 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
@@ -55,9 +55,11 @@ public class InlongGroupRequest {
@ApiModelProperty(value = "Queue model of Pulsar, parallel: multiple
partitions, high throughput, out-of-order "
+ "messages; serial: single partition, low throughput, and orderly
messages")
+ @Builder.Default
private String queueModule = "parallel";
@ApiModelProperty(value = "The number of partitions of Pulsar Topic, 1-20")
+ @Builder.Default
private Integer topicPartitionNum = 3;
@ApiModelProperty(value = "MQ resource object, in inlong group",
@@ -74,6 +76,7 @@ public class InlongGroupRequest {
private String pulsarServiceUrl;
@ApiModelProperty(value = "Whether zookeeper enabled? 0: disabled, 1:
enabled")
+ @Builder.Default
private Integer zookeeperEnabled = 0;
@ApiModelProperty(value = "Data type name")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/pulsar/PulsarTopicBean.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/pulsar/PulsarTopicBean.java
index 15e840732..69d1d6e55 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/pulsar/PulsarTopicBean.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/pulsar/PulsarTopicBean.java
@@ -36,6 +36,7 @@ public class PulsarTopicBean {
private String queueModule;
+ @Builder.Default
private Integer numPartitions = 0;
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/binlog/BinlogSourceDTO.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/binlog/BinlogSourceDTO.java
index be6ec2c77..3b14739e7 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/binlog/BinlogSourceDTO.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/binlog/BinlogSourceDTO.java
@@ -53,6 +53,7 @@ public class BinlogSourceDTO {
private int port;
@ApiModelProperty("Id of physical node of MySQL Cluster, 0 if single node")
+ @Builder.Default
private Integer serverId = 0;
@ApiModelProperty("Whether include schema, default is 'false'")
@@ -102,6 +103,7 @@ public class BinlogSourceDTO {
private String monitoredDdl;
@ApiModelProperty("Timestamp standard for binlog: SQL, ISO_8601")
+ @Builder.Default
private String timestampFormatStandard = "SQL";
@ApiModelProperty("Whether to migrate all databases")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamResponse.java
index 3b11902ac..94cfc9b98 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamResponse.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamResponse.java
@@ -99,6 +99,7 @@ public class InlongStreamResponse {
private Integer previousStatus;
@ApiModelProperty(value = "is deleted? 0: deleted, 1: not deleted")
+ @Builder.Default
private Integer isDeleted = 0;
private String creator;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamTransform.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamTransform.java
index caa1151ce..4b0655044 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamTransform.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamTransform.java
@@ -20,9 +20,11 @@ package org.apache.inlong.manager.common.pojo.stream;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.pojo.transform.TransformDefinition;
@Data
+@EqualsAndHashCode(callSuper = true)
@ApiModel("Stream Transform configuration")
public abstract class StreamTransform extends StreamNode {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/deduplication/DeDuplicationDefinition.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/deduplication/DeDuplicationDefinition.java
index fbb83f85c..4b22fc548 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/deduplication/DeDuplicationDefinition.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/deduplication/DeDuplicationDefinition.java
@@ -20,6 +20,7 @@ package
org.apache.inlong.manager.common.pojo.transform.deduplication;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.enums.TransformType;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.pojo.transform.TransformDefinition;
@@ -35,6 +36,7 @@ import java.util.concurrent.TimeUnit;
* during which duplicate records is operated;
*/
@Data
+@EqualsAndHashCode(callSuper = true)
@Builder
public class DeDuplicationDefinition extends TransformDefinition {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/filter/FilterDefinition.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/filter/FilterDefinition.java
index 983b976c8..d01e2ee08 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/filter/FilterDefinition.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/filter/FilterDefinition.java
@@ -20,6 +20,7 @@ package
org.apache.inlong.manager.common.pojo.transform.filter;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.enums.TransformType;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.pojo.transform.TransformDefinition;
@@ -31,6 +32,7 @@ import java.util.List;
* Rule mode is more recommended then script mode
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class FilterDefinition extends TransformDefinition {
public FilterDefinition(FilterStrategy filterStrategy, List<FilterRule>
filterRules) {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/joiner/JoinerDefinition.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/joiner/JoinerDefinition.java
index a682c5ed7..0c41bf747 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/joiner/JoinerDefinition.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/joiner/JoinerDefinition.java
@@ -20,6 +20,7 @@ package
org.apache.inlong.manager.common.pojo.transform.joiner;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.enums.TransformType;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.pojo.stream.StreamNode;
@@ -31,6 +32,7 @@ import java.util.List;
* A class to define operations to join two streamNode in one with relation
defined.
*/
@Data
+@EqualsAndHashCode(callSuper = true)
@Builder
public class JoinerDefinition extends TransformDefinition {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/replacer/StringReplacerDefinition.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/replacer/StringReplacerDefinition.java
index 8bcde2005..989291de5 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/replacer/StringReplacerDefinition.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/replacer/StringReplacerDefinition.java
@@ -20,6 +20,7 @@ package
org.apache.inlong.manager.common.pojo.transform.replacer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.enums.TransformType;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.pojo.transform.TransformDefinition;
@@ -30,6 +31,7 @@ import java.util.List;
* A class to define operation to replace stream fields in stream records by
ReplaceRule defined.
*/
@Data
+@EqualsAndHashCode(callSuper = true)
@Builder
public class StringReplacerDefinition extends TransformDefinition {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/splitter/SplitterDefinition.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/splitter/SplitterDefinition.java
index 5d27de018..bcaa33503 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/splitter/SplitterDefinition.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/splitter/SplitterDefinition.java
@@ -20,6 +20,7 @@ package
org.apache.inlong.manager.common.pojo.transform.splitter;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.enums.TransformType;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.pojo.transform.TransformDefinition;
@@ -30,6 +31,7 @@ import java.util.List;
* A class to define operation to split fields according to SplitRule defined.
*/
@Data
+@EqualsAndHashCode(callSuper = true)
@Builder
public class SplitterDefinition extends TransformDefinition {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java
index 668fe5209..603fbb4a3 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/ProcessQuery.java
@@ -80,12 +80,15 @@ public class ProcessQuery extends PageRequest {
private Date endTimeEnd;
@ApiModelProperty("Whether to hide, 0: not hidden, 1: hidden")
+ @Builder.Default
private Integer hidden = 0;
@ApiModelProperty("Whether to include the current to-do task")
+ @Builder.Default
private Boolean includeCurrentTask = false;
@ApiModelProperty("Whether to include the form info displayed in the list")
+ @Builder.Default
private Boolean includeShowInList = true;
}
diff --git
a/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/definition/WorkflowProcess.java
b/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/definition/WorkflowProcess.java
index 524253eb3..ae1f0f5a4 100644
---
a/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/definition/WorkflowProcess.java
+++
b/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/definition/WorkflowProcess.java
@@ -130,7 +130,7 @@ public class WorkflowProcess extends Element {
StartEvent startEvent = cloneProcess.getStartEvent();
Map<WorkflowAction, List<ConditionNextElement>> workflowActionListMap
= startEvent.getActionToNextElementMap();
- Queue<Map<WorkflowAction, List<ConditionNextElement>>> queue = new
LinkedBlockingQueue();
+ Queue<Map<WorkflowAction, List<ConditionNextElement>>> queue = new
LinkedBlockingQueue<>();
if (MapUtils.isNotEmpty(workflowActionListMap)) {
queue.add(workflowActionListMap);
}
