[INLONG-5178][Manager] Optimize Warning info for the Manager module (#…

…5186)
apache · Jul 26, 2022 · cde59a9 · cde59a9
1 parent 925a044
commit cde59a9
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 0 deletions.
diff --git a/.../src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterDTO.java b/.../src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterDTO.java
@@ -47,6 +47,7 @@ public class PulsarClusterDTO {
     private String adminUrl;
 
     @ApiModelProperty(value = "Pulsar tenant, default is 'public'")
+    @Builder.Default
     private String tenant = "public";
 
     /**

diff --git a/...src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterInfo.java b/...src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterInfo.java
@@ -19,6 +19,7 @@
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -44,6 +45,7 @@ public class PulsarClusterInfo extends ClusterInfo {
     private String adminUrl;
 
     @ApiModelProperty(value = "Pulsar tenant, default is 'public'")
+    @Builder.Default
     private String tenant = "public";
 
     public PulsarClusterInfo() {

diff --git a/...ger-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java b/...ger-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java
@@ -23,6 +23,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -67,6 +68,7 @@ public abstract class InlongGroupInfo {
     private String mqResource;
 
     @ApiModelProperty(value = "Whether to enable zookeeper? 0: disable, 1: enable")
+    @Builder.Default
     private Integer enableZookeeper = 0;
 
     @ApiModelProperty(value = "Whether to enable zookeeper? 0: disable, 1: enable")

diff --git a/...mon/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java b/...mon/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupPageRequest.java
@@ -64,5 +64,6 @@ public class InlongGroupPageRequest extends PageRequest {
     private Boolean isAdminRole;
 
     @ApiModelProperty(value = "If list streamSource for group", hidden = true)
+    @Builder.Default
     private boolean listSources = false;
 }
diff --git a/...on/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupResetRequest.java b/...on/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupResetRequest.java
@@ -45,8 +45,10 @@ public class InlongGroupResetRequest {
     private String inlongGroupId;
 
     @ApiModelProperty(value = "If rerun process when group is in operating, 0: false 1: true")
+    @Builder.Default
     private Integer rerunProcess = 0;
 
     @ApiModelProperty(value = "This params will work when rerunProcess = 0, 0: reset to fail, 1: reset to success")
+    @Builder.Default
     private Integer resetFinalStatus = 1;
 }
diff --git a/...er/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkField.java b/...er/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkField.java
@@ -53,6 +53,7 @@ public class SinkField {
     private String fieldComment;
 
     @ApiModelProperty("Is this field a meta field, 0: no, 1: yes")
+    @Builder.Default
     private Integer isMetaField = 0;
 
     @ApiModelProperty(value = "Meta field name")

diff --git a/...r/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java b/...r/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/StreamSink.java
@@ -25,6 +25,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -83,6 +84,7 @@ public abstract class StreamSink extends StreamNode {
 
     @ApiModelProperty(value = "Whether to enable create sink resource? 0: disable, 1: enable. default is 1",
             notes = "Such as create Hive table")
+    @Builder.Default
     private Integer enableCreateResource = 1;
 
     @ApiModelProperty("Backend operation log")
@@ -107,13 +109,16 @@ public abstract class StreamSink extends StreamNode {
     private Date modifyTime;
 
     @ApiModelProperty("Sink field list")
+    @Builder.Default
     private List<SinkField> sinkFieldList = Lists.newArrayList();
 
     @ApiModelProperty("Properties for sink")
+    @Builder.Default
     private Map<String, Object> properties = Maps.newHashMap();
 
     @JsonIgnore
     @ApiModelProperty("Data format type for stream sink")
+    @Builder.Default
     private DataFormat dataFormat = DataFormat.NONE;
 
     @JsonIgnore

diff --git a/...-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/iceberg/IcebergSink.java b/...-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/iceberg/IcebergSink.java
@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -43,6 +44,7 @@
 public class IcebergSink extends StreamSink {
 
     @ApiModelProperty("Catalog type, like: HIVE, HADOOP, default is HIVE")
+    @Builder.Default
     private String catalogType = "HIVE";
 
     @ApiModelProperty("Catalog uri, such as hive metastore thrift://ip:port")

diff --git a/...mmon/src/main/java/org/apache/inlong/manager/common/pojo/sink/iceberg/IcebergSinkDTO.java b/...mmon/src/main/java/org/apache/inlong/manager/common/pojo/sink/iceberg/IcebergSinkDTO.java
@@ -43,6 +43,7 @@ public class IcebergSinkDTO {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     @ApiModelProperty("Catalog type, like: HIVE, HADOOP, default is HIVE")
+    @Builder.Default
     private String catalogType = "HIVE";
 
     @ApiModelProperty("Catalog uri, such as hive metastore thrift://ip:port")

diff --git a/...nager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java b/...nager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/StreamSource.java
@@ -22,6 +22,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -103,6 +104,7 @@ public abstract class StreamSource extends StreamNode {
     private Date modifyTime;
 
     @ApiModelProperty("Properties for source")
+    @Builder.Default
     private Map<String, Object> properties = new LinkedHashMap<>();
 
     public SourceRequest genSourceRequest() {

diff --git a/...n/src/main/java/org/apache/inlong/manager/common/pojo/source/mysql/MySQLBinlogSource.java b/...n/src/main/java/org/apache/inlong/manager/common/pojo/source/mysql/MySQLBinlogSource.java
@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -55,6 +56,7 @@ public class MySQLBinlogSource extends StreamSource {
     private Integer 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'")
@@ -85,6 +87,7 @@ public class MySQLBinlogSource extends StreamSource {
     private String monitoredDdl;
 
     @ApiModelProperty("Timestamp standard for binlog: SQL, ISO_8601")
+    @Builder.Default
     private String timestampFormatStandard = "SQL";
 
     @ApiModelProperty("Need transfer total database")

diff --git a/...ommon/src/main/java/org/apache/inlong/manager/common/pojo/source/oracle/OracleSource.java b/...ommon/src/main/java/org/apache/inlong/manager/common/pojo/source/oracle/OracleSource.java
@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -70,6 +71,7 @@ public class OracleSource extends StreamSource {
     private String primaryKey;
 
     @ApiModelProperty("Need transfer total database")
+    @Builder.Default
     private boolean allMigration = false;
 
     public OracleSource() {

diff --git a/...c/main/java/org/apache/inlong/manager/common/pojo/source/postgresql/PostgreSQLSource.java b/...c/main/java/org/apache/inlong/manager/common/pojo/source/postgresql/PostgreSQLSource.java
@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -54,6 +55,7 @@ public class PostgreSQLSource extends StreamSource {
     private String hostname;
 
     @ApiModelProperty("Port of the PostgreSQL server")
+    @Builder.Default
     private Integer port = 5432;
 
     @ApiModelProperty("Database name")

diff --git a/...ommon/src/main/java/org/apache/inlong/manager/common/pojo/source/pulsar/PulsarSource.java b/...ommon/src/main/java/org/apache/inlong/manager/common/pojo/source/pulsar/PulsarSource.java
@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -43,6 +44,7 @@
 public class PulsarSource extends StreamSource {
 
     @ApiModelProperty("Pulsar tenant")
+    @Builder.Default
     private String tenant = "public";
 
     @ApiModelProperty("Pulsar namespace")
@@ -62,8 +64,10 @@ public class PulsarSource extends StreamSource {
 
     @ApiModelProperty("Configure the Source's startup mode. "
             + "Available options are earliest, latest, external-subscription, and specific-offsets.")
+    @Builder.Default
     private String scanStartupMode = "earliest";
 
+    @Builder.Default
     private boolean isInlongComponent = false;
 
     public PulsarSource() {

diff --git a/...r-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamInfo.java b/...r-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamInfo.java
@@ -76,6 +76,7 @@ public class InlongStreamInfo {
     @ApiModelProperty(value = "Whether to send synchronously, 0: no, 1: yes",
             notes = "Each task under this stream sends data synchronously, "
                     + "which will affect the throughput of data collection, please choose carefully")
+    @Builder.Default
     private Integer syncSend = 0;
 
     @ApiModelProperty(value = "Number of access items per day, unit: 10,000 items per day")
@@ -103,6 +104,7 @@ public class InlongStreamInfo {
     private Integer previousStatus;
 
     @ApiModelProperty(value = "is deleted? 0: deleted, 1: not deleted")
+    @Builder.Default
     private Integer isDeleted = 0;
 
     @ApiModelProperty(value = "Name of creator")
@@ -124,9 +126,11 @@ public class InlongStreamInfo {
     private List<InlongStreamExtInfo> extList;
 
     @ApiModelProperty("Stream source infos")
+    @Builder.Default
     private List<StreamSource> sourceList = new ArrayList<>();
 
     @ApiModelProperty("Stream sink infos")
+    @Builder.Default
     private List<StreamSink> sinkList = new ArrayList<>();
 
     @ApiModelProperty(value = "Version number")

diff --git a/...anager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamField.java b/...anager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamField.java
@@ -62,6 +62,7 @@ public class StreamField {
     private String preExpression;
 
     @ApiModelProperty("Is this field a meta field, 0: no, 1: yes")
+    @Builder.Default
     private Integer isMetaField = 0;
 
     @ApiModelProperty(value = "Meta field name")