This is an automated email from the ASF dual-hosted git repository.
gosonzhang 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 bd7321fbd [INLONG-7300][Manager] Replace getRoles() with
getAccountType() (#7301)
bd7321fbd is described below
commit bd7321fbd1be07184b85ceb481f45bf18fbfcc33
Author: Goson Zhang <[email protected]>
AuthorDate: Wed Feb 1 14:39:18 2023 +0800
[INLONG-7300][Manager] Replace getRoles() with getAccountType() (#7301)
---
.../service/cluster/InlongClusterServiceImpl.java | 36 +++++++++++-----------
.../service/group/InlongGroupProcessService.java | 2 +-
.../service/group/InlongGroupServiceImpl.java | 6 ++--
.../manager/service/node/DataNodeServiceImpl.java | 10 +++---
.../service/sink/StreamSinkServiceImpl.java | 10 +++---
.../service/source/StreamSourceServiceImpl.java | 10 +++---
.../service/stream/InlongStreamServiceImpl.java | 8 ++---
.../transform/StreamTransformServiceImpl.java | 8 ++---
8 files changed, 45 insertions(+), 45 deletions(-)
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
index 92208ba93..873054cb2 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
@@ -146,7 +146,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
@Override
public Integer saveTag(ClusterTagRequest request, UserInfo opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
"Current user does not have permission to add cluster
tag");
}
@@ -189,7 +189,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String.format("inlong cluster tag not found by id=%s",
id));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -220,7 +220,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
if (CollectionUtils.isNotEmpty(clusterTagEntities)) {
for (InlongClusterTagEntity tagEntity : clusterTagEntities) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if
(!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(tagEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
continue;
@@ -312,7 +312,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String.format("inlong cluster tag was not exist for
id=%s", request.getId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(exist.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -410,7 +410,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
return true;
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(exist.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -468,7 +468,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
@Override
public Integer save(ClusterRequest request, UserInfo opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
"Current user does not have permission to add cluster");
}
@@ -509,7 +509,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String.format("inlong cluster not found by id=%s", id));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -546,7 +546,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
List<InlongClusterEntity> filterResult = new ArrayList<>();
for (InlongClusterEntity entity : clusterEntities) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode()))
{
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
continue;
@@ -633,7 +633,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String.format("inlong cluster not found by id=%s",
request.getId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -722,7 +722,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
public Boolean bindTag(BindTagRequest request, UserInfo opInfo) {
InlongClusterTagEntity exist =
clusterTagMapper.selectByTag(request.getClusterTag());
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(exist.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -833,7 +833,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
return true;
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -882,7 +882,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String.format("inlong cluster not found by id=%s, or was
already deleted", request.getParentId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -924,7 +924,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
}
InlongClusterEntity cluster =
clusterMapper.selectById(entity.getParentId());
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(cluster.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -967,7 +967,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
}
InlongClusterEntity cluster =
clusterMapper.selectById(request.getParentId());
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode()))
{
List<String> inCharges =
Arrays.asList(cluster.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -982,7 +982,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
clusterMapper.selectByKey(request.getClusterTag(),
request.getName(), request.getType());
for (InlongClusterEntity cluster : clusterList) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if
(!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(cluster.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
continue;
@@ -1023,7 +1023,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
String.format("inlong group not exists for groupId=%s",
groupId));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -1153,7 +1153,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
request.getParentId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(cluster.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
@@ -1197,7 +1197,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
}
InlongClusterEntity cluster =
clusterMapper.selectById(entity.getParentId());
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(cluster.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED,
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
index b1e963b38..c621c51b2 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupProcessService.java
@@ -237,7 +237,7 @@ public class InlongGroupProcessService {
return true;
}
// only the person in charges can delete
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
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 b28248d12..0631a246a 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
@@ -228,7 +228,7 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
throw new BusinessException(ErrorCodeEnum.GROUP_NOT_FOUND);
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -359,7 +359,7 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
List<InlongGroupEntity> filterGroupEntities = new ArrayList<>();
for (InlongGroupEntity groupEntity :
groupMapper.selectByCondition(request)) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode()))
{
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
continue;
@@ -424,7 +424,7 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
}
chkUnmodifiableParams(entity, request);
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/DataNodeServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/DataNodeServiceImpl.java
index 0a54737c3..d7018dbf2 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/DataNodeServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/DataNodeServiceImpl.java
@@ -78,7 +78,7 @@ public class DataNodeServiceImpl implements DataNodeService {
@Override
public Integer save(DataNodeRequest request, UserInfo opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED);
}
// check if data node already exist
@@ -112,7 +112,7 @@ public class DataNodeServiceImpl implements DataNodeService
{
@Override
public DataNodeInfo get(Integer id, UserInfo opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED);
}
DataNodeEntity entity = dataNodeMapper.selectById(id);
@@ -158,7 +158,7 @@ public class DataNodeServiceImpl implements DataNodeService
{
@Override
public List<DataNodeInfo> list(DataNodePageRequest request, UserInfo
opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED);
}
// query result
@@ -207,7 +207,7 @@ public class DataNodeServiceImpl implements DataNodeService
{
@Transactional(rollbackFor = Throwable.class)
public Boolean update(DataNodeRequest request, UserInfo opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED);
}
// check the record existed
@@ -271,7 +271,7 @@ public class DataNodeServiceImpl implements DataNodeService
{
@Override
public Boolean delete(Integer id, UserInfo opInfo) {
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
throw new BusinessException(ErrorCodeEnum.PERMISSION_REQUIRED);
}
DataNodeEntity entity = dataNodeMapper.selectById(id);
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 4220fca05..bdd680084 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
@@ -156,7 +156,7 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", request.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -231,7 +231,7 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
throw new BusinessException(ErrorCodeEnum.GROUP_NOT_FOUND);
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -334,7 +334,7 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
continue;
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if
(!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
continue;
@@ -414,7 +414,7 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", curEntity.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(curGroupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -527,7 +527,7 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", sinkEntity.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
index 6abc2859c..63ea2db2d 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
@@ -130,7 +130,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", request.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -196,7 +196,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
throw new BusinessException(ErrorCodeEnum.GROUP_NOT_FOUND);
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -289,7 +289,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
OrderTypeEnum.checkOrderType(request);
List<StreamSourceEntity> entityList =
sourceMapper.selectByCondition(request);
List<StreamSourceEntity> filteredEntitys = Lists.newArrayList();
- if (opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
filteredEntitys.addAll(entityList);
} else {
Set<String> totalGroupIds = new HashSet<>();
@@ -366,7 +366,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", request.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -448,7 +448,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", entity.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
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 3e21727f9..9418e3c3e 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
@@ -145,7 +145,7 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
throw new BusinessException(ErrorCodeEnum.GROUP_NOT_FOUND);
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -229,7 +229,7 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
throw new BusinessException(ErrorCodeEnum.GROUP_NOT_FOUND);
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -417,7 +417,7 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
String.format("record has expired with record version=%d,
request version=%d",
entity.getVersion(), request.getVersion()));
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(entity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -554,7 +554,7 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
throw new BusinessException(ErrorCodeEnum.GROUP_NOT_FOUND);
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
index 59ce25c14..8d9d33669 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
@@ -107,7 +107,7 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", request.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -179,7 +179,7 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", groupId));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -252,7 +252,7 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", request.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
@@ -322,7 +322,7 @@ public class StreamTransformServiceImpl implements
StreamTransformService {
String.format("InlongGroup does not exist with
InlongGroupId=%s", request.getInlongGroupId()));
}
// only the person in charges can query
- if (!opInfo.getRoles().contains(UserTypeEnum.ADMIN.name())) {
+ if (!opInfo.getAccountType().equals(UserTypeEnum.ADMIN.getCode())) {
List<String> inCharges =
Arrays.asList(groupEntity.getInCharges().split(InlongConstants.COMMA));
if (!inCharges.contains(opInfo.getName())) {
throw new
BusinessException(ErrorCodeEnum.GROUP_PERMISSION_DENIED);
