This is an automated email from the ASF dual-hosted git repository. wakefu 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 7f9307f1b4 [INLONG-11792][Manager] Support group followers to add sinks (#11793) 7f9307f1b4 is described below commit 7f9307f1b49c03d0540d0d1d2f0334134737d2bb Author: fuweng11 <76141879+fuwen...@users.noreply.github.com> AuthorDate: Mon Mar 3 11:59:32 2025 +0800 [INLONG-11792][Manager] Support group followers to add sinks (#11793) --- .../org/apache/inlong/manager/dao/entity/InlongGroupEntity.java | 2 +- .../apache/inlong/manager/service/sink/StreamSinkServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java index a302f51630..4baf41b35d 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java @@ -49,7 +49,7 @@ public class InlongGroupEntity implements Serializable { private String extParams; private String inCharges; - private String followers; + private String followers = ""; private Integer status; private Integer previousStatus; private Integer isDeleted; 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 a278bc51c0..431d44b3d0 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 @@ -157,7 +157,7 @@ public class StreamSinkServiceImpl implements StreamSinkService { if (groupEntity == null) { throw new BusinessException(String.format("InlongGroup does not exist with InlongGroupId=%s", groupId)); } - userService.checkUser(groupEntity.getInCharges(), operator, + userService.checkUser(groupEntity.getInCharges() + InlongConstants.COMMA + groupEntity.getFollowers(), operator, "Current user does not have permission to create sink info"); // Make sure that there is no same sink name under the current groupId and streamId String streamId = request.getInlongStreamId(); @@ -458,7 +458,7 @@ public class StreamSinkServiceImpl implements StreamSinkService { } chkUnmodifiableParams(curEntity, request); InlongGroupEntity groupEntity = groupCheckService.checkGroupStatus(request.getInlongGroupId(), operator); - userService.checkUser(groupEntity.getInCharges(), operator, + userService.checkUser(groupEntity.getInCharges() + InlongConstants.COMMA + groupEntity.getFollowers(), operator, "Current user does not have permission to update sink info"); // Check whether the stream exist or not InlongStreamEntity streamEntity = streamMapper.selectByIdentifier( @@ -537,7 +537,7 @@ public class StreamSinkServiceImpl implements StreamSinkService { Preconditions.expectNotNull(entity, ErrorCodeEnum.SINK_INFO_NOT_FOUND.getMessage()); InlongGroupEntity groupEntity = groupCheckService.checkGroupStatus(entity.getInlongGroupId(), operator); - userService.checkUser(groupEntity.getInCharges(), operator, + userService.checkUser(groupEntity.getInCharges() + InlongConstants.COMMA + groupEntity.getFollowers(), operator, "Current user does not have permission to delete sink info"); StreamSinkOperator sinkOperator = operatorFactory.getInstance(entity.getSinkType()); @@ -566,7 +566,7 @@ public class StreamSinkServiceImpl implements StreamSinkService { groupId, streamId, sinkName)); InlongGroupEntity groupEntity = groupCheckService.checkGroupStatus(entity.getInlongGroupId(), operator); - userService.checkUser(groupEntity.getInCharges(), operator, + userService.checkUser(groupEntity.getInCharges() + InlongConstants.COMMA + groupEntity.getFollowers(), operator, "Current user does not have permission to delete sink info"); StreamSinkOperator sinkOperator = operatorFactory.getInstance(entity.getSinkType());