diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java index 72cbd50833..e9a90d5903 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java @@ -75,7 +75,7 @@ public class AlertGroupService extends BaseService{ public Map listPaging(User loginUser, String searchVal, Integer pageNo, Integer pageSize) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -83,7 +83,7 @@ public class AlertGroupService extends BaseService{ IPage alertGroupIPage = alertGroupMapper.queryAlertGroupPage( page, searchVal); PageInfo pageInfo = new PageInfo<>(pageNo, pageSize); - pageInfo.setTotalCount((int)alertGroupIPage.getTotal()); + pageInfo.setTotalCount((int) alertGroupIPage.getTotal()); pageInfo.setLists(alertGroupIPage.getRecords()); result.put(Constants.DATA_LIST, pageInfo); putMsg(result, Status.SUCCESS); @@ -103,7 +103,7 @@ public class AlertGroupService extends BaseService{ public Map createAlertgroup(User loginUser, String groupName, AlertType groupType, String desc) { Map result = new HashMap<>(); //only admin can operate - if (checkAdmin(loginUser, result)){ + if (isNotAdmin(loginUser, result)) { return result; } @@ -140,7 +140,7 @@ public class AlertGroupService extends BaseService{ public Map updateAlertgroup(User loginUser, int id, String groupName, AlertType groupType, String desc) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)){ + if (isNotAdmin(loginUser, result)) { return result; } @@ -183,7 +183,7 @@ public class AlertGroupService extends BaseService{ result.put(Constants.STATUS, false); //only admin can operate - if (checkAdmin(loginUser, result)){ + if (isNotAdmin(loginUser, result)) { return result; } //check exist @@ -213,7 +213,7 @@ public class AlertGroupService extends BaseService{ result.put(Constants.STATUS, false); //only admin can operate - if (checkAdmin(loginUser, result)){ + if (isNotAdmin(loginUser, result)) { return result; } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java index e9b25250a8..c61cd1eeb5 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java @@ -46,13 +46,13 @@ public class BaseService { } /** - * check admin + * isNotAdmin * * @param loginUser login user * @param result result code - * @return true if administrator, otherwise false + * @return true if not administrator, otherwise false */ - protected boolean checkAdmin(User loginUser, Map result) { + protected boolean isNotAdmin(User loginUser, Map result) { //only admin can operate if (!isAdmin(loginUser)) { putMsg(result, Status.USER_NO_OPERATION_PERM); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java index caffeabd5c..23de453e11 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java @@ -60,7 +60,7 @@ public class QueueService extends BaseService { */ public Map queryList(User loginUser) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -75,14 +75,14 @@ public class QueueService extends BaseService { * query queue list paging * * @param loginUser login user - * @param pageNo page number + * @param pageNo page number * @param searchVal search value - * @param pageSize page size + * @param pageSize page size * @return queue list */ public Map queryList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -105,13 +105,13 @@ public class QueueService extends BaseService { * create queue * * @param loginUser login user - * @param queue queue + * @param queue queue * @param queueName queue name * @return create result */ public Map createQueue(User loginUser, String queue, String queueName) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -153,14 +153,14 @@ public class QueueService extends BaseService { * update queue * * @param loginUser login user - * @param queue queue - * @param id queue id + * @param queue queue + * @param id queue id * @param queueName queue name * @return update result code */ public Map updateQueue(User loginUser, int id, String queue, String queueName) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java index dffc55edfe..e7d8906f28 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java @@ -1158,20 +1158,20 @@ public class ResourcesService extends BaseService { public Map authorizeResourceTree(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } List resourceList = resourcesMapper.queryResourceExceptUserId(userId); - List list ; + List list; if (CollectionUtils.isNotEmpty(resourceList)) { Visitor visitor = new ResourceTreeVisitor(resourceList); list = visitor.visit().getChildren(); - }else { + } else { list = new ArrayList<>(0); } result.put(Constants.DATA_LIST, list); - putMsg(result,Status.SUCCESS); + putMsg(result, Status.SUCCESS); return result; } @@ -1185,23 +1185,23 @@ public class ResourcesService extends BaseService { public Map unauthorizedFile(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } List resourceList = resourcesMapper.queryResourceExceptUserId(userId); - List list ; + List list; if (resourceList != null && resourceList.size() > 0) { Set resourceSet = new HashSet<>(resourceList); List authedResourceList = resourcesMapper.queryAuthorizedResourceList(userId); getAuthorizedResourceList(resourceSet, authedResourceList); list = new ArrayList<>(resourceSet); - }else { + } else { list = new ArrayList<>(0); } Visitor visitor = new ResourceTreeVisitor(list); result.put(Constants.DATA_LIST, visitor.visit().getChildren()); - putMsg(result,Status.SUCCESS); + putMsg(result, Status.SUCCESS); return result; } @@ -1215,7 +1215,7 @@ public class ResourcesService extends BaseService { public Map unauthorizedUDFFunction(User loginUser, Integer userId) { Map result = new HashMap<>(5); //only admin can operate - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -1231,13 +1231,11 @@ public class ResourcesService extends BaseService { resultList = new ArrayList<>(udfFuncSet); } result.put(Constants.DATA_LIST, resultList); - putMsg(result,Status.SUCCESS); + putMsg(result, Status.SUCCESS); return result; } - - /** * authorized udf function * @@ -1247,12 +1245,12 @@ public class ResourcesService extends BaseService { */ public Map authorizedUDFFunction(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } List udfFuncs = udfFunctionMapper.queryAuthedUdfFunc(userId); result.put(Constants.DATA_LIST, udfFuncs); - putMsg(result,Status.SUCCESS); + putMsg(result, Status.SUCCESS); return result; } @@ -1266,7 +1264,7 @@ public class ResourcesService extends BaseService { */ public Map authorizedFile(User loginUser, Integer userId) { Map result = new HashMap<>(5); - if (checkAdmin(loginUser, result)){ + if (isNotAdmin(loginUser, result)) { return result; } List authedResources = resourcesMapper.queryAuthorizedResourceList(userId); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java index 3f21679b34..83cbd197cd 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java @@ -70,7 +70,7 @@ public class WorkerGroupService extends BaseService { Integer toIndex = (pageNo - 1) * pageSize + pageSize; Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java index fd47342c12..06b8eacf1b 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java @@ -293,7 +293,7 @@ public class ProjectServiceImpl extends BaseService implements ProjectService { */ public Map queryUnauthorizedProject(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } /** @@ -344,7 +344,7 @@ public class ProjectServiceImpl extends BaseService implements ProjectService { public Map queryAuthorizedProject(User loginUser, Integer userId) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -364,7 +364,7 @@ public class ProjectServiceImpl extends BaseService implements ProjectService { public Map queryProjectCreatedByUser(User loginUser) { Map result = new HashMap<>(); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java index d27ce47122..8aafe9102e 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java @@ -89,7 +89,7 @@ public class TenantServiceImpl extends BaseService implements TenantService { Map result = new HashMap<>(5); result.put(Constants.STATUS, false); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -134,14 +134,14 @@ public class TenantServiceImpl extends BaseService implements TenantService { * * @param loginUser login user * @param searchVal search value - * @param pageNo page number - * @param pageSize page size + * @param pageNo page number + * @param pageSize page size * @return tenant list page */ public Map queryTenantList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) { Map result = new HashMap<>(5); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -174,7 +174,7 @@ public class TenantServiceImpl extends BaseService implements TenantService { Map result = new HashMap<>(5); result.put(Constants.STATUS, false); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; } @@ -227,7 +227,7 @@ public class TenantServiceImpl extends BaseService implements TenantService { * delete tenant * * @param loginUser login user - * @param id tenant id + * @param id tenant id * @return delete result code * @throws Exception exception */ @@ -235,7 +235,7 @@ public class TenantServiceImpl extends BaseService implements TenantService { public Map deleteTenantById(User loginUser, int id) throws Exception { Map result = new HashMap<>(5); - if (checkAdmin(loginUser, result)) { + if (isNotAdmin(loginUser, result)) { return result; }