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/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 9ab526cd8 [INLONG-4847][Manager] Add prompt message for the non-blank
check (#4848)
9ab526cd8 is described below
commit 9ab526cd8fc7ae3106d3beb5b796787b1868ac57
Author: healchow <[email protected]>
AuthorDate: Sun Jul 3 22:54:26 2022 +0800
[INLONG-4847][Manager] Add prompt message for the non-blank check (#4848)
---
.../common/pojo/cluster/BindTagRequest.java | 4 +-
.../common/pojo/cluster/ClusterNodeRequest.java | 11 ++-
.../common/pojo/cluster/ClusterRequest.java | 3 +
.../common/pojo/cluster/ClusterTagRequest.java | 5 +-
.../pojo/cluster/pulsar/PulsarClusterRequest.java | 3 +-
.../{SaveReqValid.java => SaveValidation.java} | 4 +-
.../{UpdateReqValid.java => UpdateValidation.java} | 2 +-
.../common/pojo/consumption/ConsumptionInfo.java | 3 +-
.../manager/common/pojo/node/DataNodeRequest.java | 4 +-
.../manager/common/pojo/sink/SinkPageRequest.java | 4 +-
.../manager/common/pojo/sink/SinkRequest.java | 10 +--
.../common/pojo/sink/hive/HiveSinkRequest.java | 10 +--
.../common/pojo/source/SourcePageRequest.java | 4 +-
.../manager/common/pojo/source/SourceRequest.java | 10 +--
.../common/pojo/transform/TransformRequest.java | 20 ++---
.../inlong/manager/common/pojo/user/UserInfo.java | 10 +--
.../dao/mapper/StreamTransformEntityMapper.java | 7 +-
.../mappers/StreamTransformEntityMapper.xml | 87 +++++++++++-----------
.../transform/StreamTransformServiceTest.java | 36 ++++-----
.../manager/web/controller/DataNodeController.java | 4 +-
.../web/controller/InlongClusterController.java | 7 +-
21 files changed, 132 insertions(+), 116 deletions(-)
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/BindTagRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/BindTagRequest.java
index f7ef982b3..304061e05 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/BindTagRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/BindTagRequest.java
@@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
import java.util.List;
/**
@@ -31,7 +31,7 @@ import java.util.List;
@ApiModel("Cluster bind and unbind tag request")
public class BindTagRequest {
- @NotNull
+ @NotBlank(message = "clusterTag cannot be blank")
@ApiModelProperty(value = "Cluster tag")
private String clusterTag;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterNodeRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterNodeRequest.java
index 591247f38..01b0b6165 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterNodeRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterNodeRequest.java
@@ -20,7 +20,9 @@ package org.apache.inlong.manager.common.pojo.cluster;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
@@ -30,22 +32,23 @@ import javax.validation.constraints.NotNull;
@ApiModel("Cluster node request")
public class ClusterNodeRequest {
+ @NotNull(groups = UpdateValidation.class)
@ApiModelProperty(value = "Primary key")
private Integer id;
- @NotNull
+ @NotNull(message = "parentId cannot be null")
@ApiModelProperty(value = "ID of the parent cluster")
private Integer parentId;
- @NotNull
+ @NotBlank(message = "type cannot be blank")
@ApiModelProperty(value = "Cluster type, including TUBE, PULSAR,
DATA_PROXY, etc.")
private String type;
- @NotNull
+ @NotBlank(message = "ip cannot be blank")
@ApiModelProperty(value = "Cluster IP")
private String ip;
- @NotNull
+ @NotNull(message = "port cannot be null")
@ApiModelProperty(value = "Cluster port")
private Integer port;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterRequest.java
index 4e1a3ec7a..07d52d264 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterRequest.java
@@ -24,8 +24,10 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
* Inlong cluster request
@@ -38,6 +40,7 @@ import javax.validation.constraints.NotBlank;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, visible = true, property = "type")
public class ClusterRequest {
+ @NotNull(groups = UpdateValidation.class)
@ApiModelProperty(value = "Primary key")
private Integer id;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterTagRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterTagRequest.java
index 8add6855f..79f993f65 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterTagRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/ClusterTagRequest.java
@@ -20,7 +20,9 @@ package org.apache.inlong.manager.common.pojo.cluster;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
@@ -30,10 +32,11 @@ import javax.validation.constraints.NotNull;
@ApiModel("Cluster tag request")
public class ClusterTagRequest {
+ @NotNull(groups = UpdateValidation.class)
@ApiModelProperty(value = "Primary key")
private Integer id;
- @NotNull
+ @NotBlank(message = "clusterTag cannot be blank")
@ApiModelProperty(value = "Cluster tag")
private String clusterTag;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterRequest.java
index 612db1fb2..32db66e11 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/cluster/pulsar/PulsarClusterRequest.java
@@ -36,7 +36,8 @@ import org.apache.inlong.manager.common.util.JsonTypeDefine;
@ApiModel("Inlong cluster request for Pulsar")
public class PulsarClusterRequest extends ClusterRequest {
- @ApiModelProperty(value = "Pulsar admin URL, such as:
http://127.0.0.1:8080";)
+ @ApiModelProperty(value = "Pulsar admin URL, such as:
http://127.0.0.1:8080";,
+ notes = "Pulsar service URL is the 'url' field of the cluster")
private String adminUrl;
@ApiModelProperty(value = "Pulsar tenant")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/SaveReqValid.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/SaveValidation.java
similarity index 92%
rename from
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/SaveReqValid.java
rename to
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/SaveValidation.java
index 78a263eb3..21a76e4c1 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/SaveReqValid.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/SaveValidation.java
@@ -22,8 +22,8 @@ import javax.validation.groups.Default;
/**
* Used for validate add request fields group
*
- * @see UpdateReqValid
+ * @see UpdateValidation
*/
-public interface SaveReqValid extends Default {
+public interface SaveValidation extends Default {
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/UpdateReqValid.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/UpdateValidation.java
similarity index 96%
rename from
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/UpdateReqValid.java
rename to
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/UpdateValidation.java
index bf7a07b08..ec75030c1 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/UpdateReqValid.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/common/UpdateValidation.java
@@ -29,6 +29,6 @@ import javax.validation.groups.Default;
* and this id must be carried when updating, we can use it like this
* {@link org.apache.inlong.manager.common.pojo.node.DataNodeRequest}
*/
-public interface UpdateReqValid extends Default {
+public interface UpdateValidation extends Default {
}
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 ecef9c7b0..8a1c273ac 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
@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -49,7 +48,7 @@ public class ConsumptionInfo {
private String consumerGroup;
@ApiModelProperty(value = "consumption in charge")
- @NotNull(message = "inCharges cannot be null")
+ @NotBlank(message = "inCharges cannot be null")
private String inCharges;
@ApiModelProperty(value = "consumption target inlong group id")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java
index 362d1757c..04e7f6b01 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/node/DataNodeRequest.java
@@ -23,7 +23,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.inlong.manager.common.pojo.common.UpdateReqValid;
+import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -38,7 +38,7 @@ import javax.validation.constraints.NotNull;
@ApiModel("Data node request")
public class DataNodeRequest {
- @NotNull(groups = UpdateReqValid.class)
+ @NotNull(groups = UpdateValidation.class)
@ApiModelProperty(value = "Primary key")
private Integer id;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
index 4bc733ef2..55c27bff8 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkPageRequest.java
@@ -23,7 +23,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.beans.PageRequest;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
/**
* Paging query request for Sink
@@ -34,7 +34,7 @@ import javax.validation.constraints.NotNull;
public class SinkPageRequest extends PageRequest {
@ApiModelProperty(value = "Inlong group id", required = true)
- @NotNull(message = "inlongGroupId cannot be null")
+ @NotBlank(message = "inlongGroupId cannot be null")
private String inlongGroupId;
@ApiModelProperty(value = "Inlong stream id")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkRequest.java
index e532e586c..58585a78e 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkRequest.java
@@ -24,7 +24,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
@@ -39,19 +39,19 @@ public class SinkRequest {
@ApiModelProperty("Sink id")
private Integer id;
- @NotNull(message = "inlongGroupId cannot be null")
+ @NotBlank(message = "inlongGroupId cannot be null")
@ApiModelProperty("Inlong group id")
private String inlongGroupId;
- @NotNull(message = "inlongStreamId cannot be null")
+ @NotBlank(message = "inlongStreamId cannot be null")
@ApiModelProperty("Inlong stream id")
private String inlongStreamId;
- @NotNull(message = "sinkType cannot be null")
+ @NotBlank(message = "sinkType cannot be null")
@ApiModelProperty("Sink type, including: HIVE, ES, etc.")
private String sinkType;
- @NotNull(message = "sinkName cannot be null")
+ @NotBlank(message = "sinkName cannot be null")
@ApiModelProperty("Sink name, unique in one stream")
private String sinkName;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/hive/HiveSinkRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/hive/HiveSinkRequest.java
index 04d172ae7..025553949 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/hive/HiveSinkRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/hive/HiveSinkRequest.java
@@ -28,7 +28,7 @@ import org.apache.inlong.manager.common.enums.SinkType;
import org.apache.inlong.manager.common.pojo.sink.SinkRequest;
import org.apache.inlong.manager.common.util.JsonTypeDefine;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -42,7 +42,7 @@ import java.util.List;
@JsonTypeDefine(value = SinkType.SINK_HIVE)
public class HiveSinkRequest extends SinkRequest {
- @NotNull(message = "jdbcUrl cannot be null")
+ @NotBlank(message = "jdbcUrl cannot be null")
@ApiModelProperty("Hive JDBC URL, such as jdbc:hive2://${ip}:${port}")
private String jdbcUrl;
@@ -52,15 +52,15 @@ public class HiveSinkRequest extends SinkRequest {
@ApiModelProperty("User password")
private String password;
- @NotNull(message = "dbName cannot be null")
+ @NotBlank(message = "dbName cannot be null")
@ApiModelProperty("Target database name")
private String dbName;
- @NotNull(message = "tableName cannot be null")
+ @NotBlank(message = "tableName cannot be null")
@ApiModelProperty("Target table name")
private String tableName;
- @NotNull(message = "dataPath cannot be null")
+ @NotBlank(message = "dataPath cannot be null")
@ApiModelProperty("Data path, such as:
hdfs://ip:port/user/hive/warehouse/test.db")
private String dataPath;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
index 5b90d747e..4e853d155 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourcePageRequest.java
@@ -23,7 +23,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.beans.PageRequest;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
/**
* Paging query request for Source
@@ -33,7 +33,7 @@ import javax.validation.constraints.NotNull;
@ApiModel("Paging query request for Source")
public class SourcePageRequest extends PageRequest {
- @NotNull
+ @NotBlank(message = "inlongGroupId cannot be blank")
@ApiModelProperty(value = "Inlong group id", required = true)
private String inlongGroupId;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceRequest.java
index 1b808b15f..7657554c2 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/source/SourceRequest.java
@@ -24,7 +24,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
import java.util.List;
/**
@@ -37,19 +37,19 @@ public class SourceRequest {
private Integer id;
- @NotNull(message = "inlongGroupId cannot be null")
+ @NotBlank(message = "inlongGroupId cannot be null")
@ApiModelProperty("Inlong group id")
private String inlongGroupId;
- @NotNull(message = "inlongStreamId cannot be null")
+ @NotBlank(message = "inlongStreamId cannot be null")
@ApiModelProperty("Inlong stream id")
private String inlongStreamId;
- @NotNull(message = "sourceType cannot be null")
+ @NotBlank(message = "sourceType cannot be null")
@ApiModelProperty("Source type, including: FILE, KAFKA, etc.")
private String sourceType;
- @NotNull(message = "sourceName cannot be null")
+ @NotBlank(message = "sourceName cannot be null")
@ApiModelProperty("Source name, unique in one stream")
private String sourceName;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/TransformRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/TransformRequest.java
index caf3267f5..bdb1722d4 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/TransformRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/transform/TransformRequest.java
@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
import java.util.List;
/**
@@ -34,31 +34,31 @@ public class TransformRequest {
private int id;
- @NotNull
+ @NotBlank(message = "inlongGroupId cannot be blank")
@ApiModelProperty("Inlong group id")
private String inlongGroupId;
- @NotNull
+ @NotBlank(message = "inlongStreamId cannot be blank")
@ApiModelProperty("Inlong stream id")
private String inlongStreamId;
- @NotNull
+ @NotBlank(message = "transformName cannot be blank")
@ApiModelProperty("Transform name, unique in one stream")
private String transformName;
- @NotNull
+ @NotBlank(message = "transformType cannot be blank")
@ApiModelProperty("Transform type, including: splitter, filter, joiner,
etc.")
private String transformType;
- @NotNull
+ @NotBlank(message = "preNodeNames cannot be blank")
@ApiModelProperty("Pre node names of transform in this stream, join by
','")
- private String preNodeNames = "";
+ private String preNodeNames;
- @NotNull
+ @NotBlank(message = "postNodeNames cannot be blank")
@ApiModelProperty("Post node names of transform in this stream, join by
','")
- private String postNodeNames = "";
+ private String postNodeNames;
- @NotNull
+ @NotBlank(message = "transformDefinition cannot be blank")
@ApiModelProperty("Transform definition in json type")
private String transformDefinition;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserInfo.java
index d4d5ada15..3b4a94ab0 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserInfo.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserInfo.java
@@ -43,18 +43,18 @@ public class UserInfo {
private Integer id;
/**
- * user type {@link UserTypeEnum}
+ * User type {@link UserTypeEnum}
*/
- @NotNull
+ @NotNull(message = "type cannot be null")
@InEnumInt(UserTypeEnum.class)
@ApiModelProperty(value = "type: 0 - manager, 1 - operator", required =
true)
private Integer type;
- @NotBlank
+ @NotBlank(message = "username cannot be blank")
@ApiModelProperty(value = "username", required = true)
private String username;
- @NotBlank
+ @NotBlank(message = "password cannot be blank")
@ApiModelProperty(value = "password", required = true)
private String password;
@@ -67,8 +67,8 @@ public class UserInfo {
@ApiModelProperty("private key")
private String privateKey;
- @NotNull
@Min(1)
+ @NotNull(message = "validDays cannot be null")
@ApiModelProperty(value = "valid days", required = true)
private Integer validDays;
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamTransformEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamTransformEntityMapper.java
index 88edd5e1d..c4bc4ca1a 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamTransformEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamTransformEntityMapper.java
@@ -26,8 +26,6 @@ import java.util.List;
@Repository
public interface StreamTransformEntityMapper {
- int deleteById(Integer id);
-
int insert(StreamTransformEntity record);
int insertSelective(StreamTransformEntity record);
@@ -37,7 +35,10 @@ public interface StreamTransformEntityMapper {
List<StreamTransformEntity> selectByRelatedId(@Param("groupId") String
groupId, @Param("streamId") String streamId,
@Param("transformName") String transformName);
+ int updateById(StreamTransformEntity record);
+
int updateByIdSelective(StreamTransformEntity record);
- int updateById(StreamTransformEntity record);
+ int deleteById(Integer id);
+
}
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
index 4757db096..f10989a1d 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
@@ -40,32 +40,6 @@
id, inlong_group_id, inlong_stream_id, transform_name, transform_type,
pre_node_names, post_node_names,
transform_definition, version, is_deleted, creator, modifier,
create_time, modify_time
</sql>
- <select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from stream_transform
- where id = #{id,jdbcType=INTEGER}
- </select>
- <select id="selectByRelatedId"
resultType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
- select
- <include refid="Base_Column_List"/>
- from stream_transform
- <where>
- is_deleted = 0
- and inlong_group_id = #{groupId, jdbcType=VARCHAR}
- <if test="streamId != null and streamId != ''">
- and inlong_stream_id = #{streamId, jdbcType=VARCHAR}
- </if>
- <if test="transformName != null and transformName != ''">
- and transform_name = #{transformName, jdbcType=VARCHAR}
- </if>
- </where>
- </select>
- <delete id="deleteById" parameterType="java.lang.Integer">
- delete
- from stream_transform
- where id = #{id,jdbcType=INTEGER}
- </delete>
<insert id="insert" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
insert into stream_transform (id, inlong_group_id, inlong_stream_id,
@@ -171,6 +145,46 @@
</if>
</trim>
</insert>
+
+ <select id="selectById" parameterType="java.lang.Integer"
resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from stream_transform
+ where id = #{id,jdbcType=INTEGER}
+ </select>
+ <select id="selectByRelatedId"
resultType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
+ select
+ <include refid="Base_Column_List"/>
+ from stream_transform
+ <where>
+ is_deleted = 0
+ and inlong_group_id = #{groupId, jdbcType=VARCHAR}
+ <if test="streamId != null and streamId != ''">
+ and inlong_stream_id = #{streamId, jdbcType=VARCHAR}
+ </if>
+ <if test="transformName != null and transformName != ''">
+ and transform_name = #{transformName, jdbcType=VARCHAR}
+ </if>
+ </where>
+ </select>
+
+ <update id="updateById"
parameterType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
+ update stream_transform
+ set inlong_group_id = #{inlongGroupId,jdbcType=VARCHAR},
+ inlong_stream_id = #{inlongStreamId,jdbcType=VARCHAR},
+ transform_name = #{transformName,jdbcType=VARCHAR},
+ transform_type = #{transformType,jdbcType=VARCHAR},
+ pre_node_names = #{preNodeNames,jdbcType=VARCHAR},
+ post_node_names = #{postNodeNames,jdbcType=VARCHAR},
+ transform_definition = #{transformDefinition,jdbcType=VARCHAR},
+ version = #{version,jdbcType=INTEGER},
+ is_deleted = #{isDeleted,jdbcType=INTEGER},
+ creator = #{creator,jdbcType=VARCHAR},
+ modifier = #{modifier,jdbcType=VARCHAR},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ modify_time = #{modifyTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=INTEGER}
+ </update>
<update id="updateByIdSelective"
parameterType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
update stream_transform
<set>
@@ -216,21 +230,10 @@
</set>
where id = #{id,jdbcType=INTEGER}
</update>
- <update id="updateById"
parameterType="org.apache.inlong.manager.dao.entity.StreamTransformEntity">
- update stream_transform
- set inlong_group_id = #{inlongGroupId,jdbcType=VARCHAR},
- inlong_stream_id = #{inlongStreamId,jdbcType=VARCHAR},
- transform_name = #{transformName,jdbcType=VARCHAR},
- transform_type = #{transformType,jdbcType=VARCHAR},
- pre_node_names = #{preNodeNames,jdbcType=VARCHAR},
- post_node_names = #{postNodeNames,jdbcType=VARCHAR},
- transform_definition = #{transformDefinition,jdbcType=VARCHAR},
- version = #{version,jdbcType=INTEGER},
- is_deleted = #{isDeleted,jdbcType=INTEGER},
- creator = #{creator,jdbcType=VARCHAR},
- modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP}
+
+ <delete id="deleteById" parameterType="java.lang.Integer">
+ delete
+ from stream_transform
where id = #{id,jdbcType=INTEGER}
- </update>
+ </delete>
</mapper>
\ No newline at end of file
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/transform/StreamTransformServiceTest.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/transform/StreamTransformServiceTest.java
index adf467981..0ea35eb12 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/transform/StreamTransformServiceTest.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/transform/StreamTransformServiceTest.java
@@ -17,6 +17,7 @@
package org.apache.inlong.manager.service.transform;
+import org.apache.inlong.manager.common.consts.InlongConstants;
import org.apache.inlong.manager.common.enums.TransformType;
import org.apache.inlong.manager.common.pojo.transform.TransformRequest;
import org.apache.inlong.manager.common.pojo.transform.TransformResponse;
@@ -45,26 +46,27 @@ public class StreamTransformServiceTest extends
ServiceBaseTest {
@Test
public void testSaveStreamTransform() {
- TransformRequest transformRequest = new TransformRequest();
- transformRequest.setTransformName(TRANSFORM_NAME);
- transformRequest.setTransformType(TransformType.FILTER.getType());
- transformRequest.setTransformDefinition("{}");
- transformRequest.setInlongStreamId(GLOBAL_STREAM_ID);
- transformRequest.setInlongGroupId(GLOBAL_GROUP_ID);
- StreamTransformEntity transformEntity =
CommonBeanUtils.copyProperties(transformRequest,
- StreamTransformEntity::new);
- transformEntity.setCreator(GLOBAL_OPERATOR);
- transformEntity.setModifier(GLOBAL_OPERATOR);
+ TransformRequest request = new TransformRequest();
+ request.setTransformName(TRANSFORM_NAME);
+ request.setTransformType(TransformType.FILTER.getType());
+ request.setTransformDefinition("{}");
+ request.setPreNodeNames(TRANSFORM_NAME + "_pre");
+ request.setPostNodeNames(TRANSFORM_NAME + "_post");
+ request.setInlongStreamId(GLOBAL_STREAM_ID);
+ request.setInlongGroupId(GLOBAL_GROUP_ID);
+ StreamTransformEntity entity = CommonBeanUtils.copyProperties(request,
StreamTransformEntity::new);
+ entity.setCreator(GLOBAL_OPERATOR);
+ entity.setModifier(GLOBAL_OPERATOR);
Date now = new Date();
- transformEntity.setCreateTime(now);
- transformEntity.setModifyTime(now);
- int index = transformEntityMapper.insertSelective(transformEntity);
+ entity.setCreateTime(now);
+ entity.setModifyTime(now);
+ entity.setVersion(1);
+ entity.setIsDeleted(InlongConstants.UN_DELETED);
+ int index = transformEntityMapper.insert(entity);
Assertions.assertEquals(1, index);
- List<TransformResponse> transformResponses =
streamTransformService.listTransform(GLOBAL_GROUP_ID,
- GLOBAL_STREAM_ID);
- Assertions.assertEquals(1, transformResponses.size());
-
+ List<TransformResponse> responses =
streamTransformService.listTransform(GLOBAL_GROUP_ID, GLOBAL_STREAM_ID);
+ Assertions.assertEquals(1, responses.size());
}
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
index 72aa9d2d2..41ca7e5d0 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
@@ -23,7 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
-import org.apache.inlong.manager.common.pojo.common.UpdateReqValid;
+import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
import org.apache.inlong.manager.common.pojo.node.DataNodePageRequest;
import org.apache.inlong.manager.common.pojo.node.DataNodeRequest;
import org.apache.inlong.manager.common.pojo.node.DataNodeResponse;
@@ -78,7 +78,7 @@ public class DataNodeController {
@PostMapping(value = "/update")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update data node")
- public Response<Boolean> update(@Validated(UpdateReqValid.class)
@RequestBody DataNodeRequest request) {
+ public Response<Boolean> update(@Validated(UpdateValidation.class)
@RequestBody DataNodeRequest request) {
String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(dataNodeService.update(request, username));
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
index 601720976..10b29ce33 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
@@ -32,6 +32,7 @@ import
org.apache.inlong.manager.common.pojo.cluster.ClusterRequest;
import org.apache.inlong.manager.common.pojo.cluster.ClusterTagPageRequest;
import org.apache.inlong.manager.common.pojo.cluster.ClusterTagRequest;
import org.apache.inlong.manager.common.pojo.cluster.ClusterTagResponse;
+import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
import org.apache.inlong.manager.common.pojo.user.UserRoleCode;
import org.apache.inlong.manager.common.util.LoginUserUtils;
import org.apache.inlong.manager.service.cluster.InlongClusterService;
@@ -84,7 +85,7 @@ public class InlongClusterController {
@PostMapping(value = "/cluster/tag/update")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update cluster tag")
- public Response<Boolean> updateTag(@Validated @RequestBody
ClusterTagRequest request) {
+ public Response<Boolean> updateTag(@Validated(UpdateValidation.class)
@RequestBody ClusterTagRequest request) {
String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.updateTag(request, username));
}
@@ -123,7 +124,7 @@ public class InlongClusterController {
@PostMapping(value = "/cluster/update")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update cluster")
- public Response<Boolean> update(@Validated @RequestBody ClusterRequest
request) {
+ public Response<Boolean> update(@Validated(UpdateValidation.class)
@RequestBody ClusterRequest request) {
String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.update(request, username));
}
@@ -169,7 +170,7 @@ public class InlongClusterController {
@RequestMapping(value = "/cluster/node/update", method =
RequestMethod.POST)
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update cluster node")
- public Response<Boolean> updateNode(@Validated @RequestBody
ClusterNodeRequest request) {
+ public Response<Boolean> updateNode(@Validated(UpdateValidation.class)
@RequestBody ClusterNodeRequest request) {
String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.updateNode(request, username));
}
