This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 9a7526793 [INLONG-7529][Manager] Change the pattern limitation of
InlongGroupId and InlongStreamId (#7530)
9a7526793 is described below
commit 9a7526793451ab0cc28cd8effc8f629fb2c8f446
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Tue Mar 7 09:50:21 2023 +0800
[INLONG-7529][Manager] Change the pattern limitation of InlongGroupId and
InlongStreamId (#7530)
---
.../org/apache/inlong/manager/pojo/group/InlongGroupRequest.java | 2 +-
.../main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java | 4 ++--
.../java/org/apache/inlong/manager/pojo/source/SourceRequest.java | 4 ++--
.../org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java | 5 ++---
.../apache/inlong/manager/pojo/transform/DeleteTransformRequest.java | 4 ++--
.../apache/inlong/manager/service/group/InlongGroupServiceImpl.java | 2 ++
.../apache/inlong/manager/service/sink/StreamSinkServiceImpl.java | 2 ++
.../inlong/manager/service/stream/InlongStreamServiceImpl.java | 2 ++
8 files changed, 15 insertions(+), 10 deletions(-)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
index 346d19d3c..7869cf092 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
@@ -49,7 +49,7 @@ public abstract class InlongGroupRequest extends
BaseInlongGroup {
@ApiModelProperty(value = "Inlong group id", required = true)
@NotBlank(message = "inlongGroupId cannot be blank")
@Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
private String inlongGroupId;
@ApiModelProperty(value = "Inlong group name", required = true)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
index 11b1729e6..afaef2506 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
@@ -50,13 +50,13 @@ public abstract class SinkRequest {
@ApiModelProperty("Inlong group id")
@NotBlank(groups = {SaveValidation.class, UpdateByKeyValidation.class},
message = "inlongGroupId cannot be blank")
@Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
private String inlongGroupId;
@ApiModelProperty("Inlong stream id")
@NotBlank(groups = {SaveValidation.class, UpdateByKeyValidation.class},
message = "inlongStreamId cannot be blank")
@Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
private String inlongStreamId;
@ApiModelProperty("Sink type, including: HIVE, ES, etc.")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
index 0b25f6f91..4b07ef0b3 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/SourceRequest.java
@@ -50,13 +50,13 @@ public class SourceRequest {
@ApiModelProperty("Inlong group id")
@NotBlank(groups = SaveValidation.class, message = "inlongGroupId cannot
be blank")
@Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
private String inlongGroupId;
@ApiModelProperty("Inlong stream id")
@NotBlank(groups = SaveValidation.class, message = "inlongStreamId cannot
be blank")
@Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
private String inlongStreamId;
@ApiModelProperty("Source type, including: FILE, KAFKA, etc.")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
index d79494287..e2018a65f 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamRequest.java
@@ -21,7 +21,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import org.apache.inlong.manager.common.validation.UpdateValidation;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.Range;
@@ -46,13 +45,13 @@ public class InlongStreamRequest extends BaseInlongStream {
@ApiModelProperty(value = "Inlong group id")
@NotBlank(message = "inlongGroupId cannot be blank")
@Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
private String inlongGroupId;
@ApiModelProperty(value = "Inlong stream id")
@NotBlank(message = "inlongStreamId cannot be blank")
@Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
private String inlongStreamId;
@ApiModelProperty(value = "Inlong stream name", required = true)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/DeleteTransformRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/DeleteTransformRequest.java
index ac1d2cf3d..471a8f2b8 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/DeleteTransformRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/DeleteTransformRequest.java
@@ -34,13 +34,13 @@ public class DeleteTransformRequest {
@ApiModelProperty("Inlong group id")
@NotBlank(message = "inlongGroupId cannot be blank")
@Length(min = 4, max = 100, message = "length must be between 4 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{4,100}$", message = "only supports
lowercase letters, numbers, '-', or '_'")
private String inlongGroupId;
@ApiModelProperty("Inlong stream id")
@NotBlank(message = "inlongStreamId cannot be blank")
@Length(min = 1, max = 100, message = "inlongStreamId length must be
between 1 and 100")
- @Pattern(regexp = "^[a-z0-9_-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-z0-9_.-]{1,100}$", message = "inlongStreamId only
supports lowercase letters, numbers, '-', or '_'")
private String inlongStreamId;
@ApiModelProperty("Transform name, unique in one stream")
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index 458da63e6..cdd83e8f6 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -354,6 +354,8 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
public List<InlongGroupBriefInfo> listBrief(InlongGroupPageRequest
request, UserInfo opInfo) {
// filter records;
List<InlongGroupEntity> filterGroupEntities = new ArrayList<>();
+ OrderFieldEnum.checkOrderField(request);
+ OrderTypeEnum.checkOrderType(request);
for (InlongGroupEntity groupEntity :
groupMapper.selectByCondition(request)) {
// only the person in charges can query
if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode()))
{
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
index 57b0c8b77..dcd8d1d1b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
@@ -317,6 +317,8 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
throw new BusinessException(ErrorCodeEnum.GROUP_ID_IS_EMPTY);
}
// query result
+ OrderFieldEnum.checkOrderField(request);
+ OrderTypeEnum.checkOrderType(request);
List<StreamSinkEntity> sinkEntityList =
sinkMapper.selectByCondition(request);
Map<String, Page<StreamSinkEntity>> sinkMap = Maps.newHashMap();
for (StreamSinkEntity streamSink : sinkEntityList) {
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamServiceImpl.java
index 7138636f9..b83b5e633 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/stream/InlongStreamServiceImpl.java
@@ -318,6 +318,8 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
public List<InlongStreamBriefInfo> listBrief(InlongStreamPageRequest
request, UserInfo opInfo) {
request.setCurrentUser(opInfo.getName());
request.setIsAdminRole(opInfo.getRoles().contains(UserRoleCode.ADMIN));
+ OrderFieldEnum.checkOrderField(request);
+ OrderTypeEnum.checkOrderType(request);
return
CommonBeanUtils.copyListProperties(streamMapper.selectByCondition(request),
InlongStreamBriefInfo::new);
}
