This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 344ad4a7e8 [Chore] Remove unused code in api-server (#17871)
344ad4a7e8 is described below
commit 344ad4a7e895df846cc59e7e817756b196a5aff9
Author: Wenjun Ruan <[email protected]>
AuthorDate: Sat Jan 17 22:30:21 2026 +0800
[Chore] Remove unused code in api-server (#17871)
---
.../dolphinscheduler/api/ApiApplicationServer.java | 5 --
.../apache/dolphinscheduler/api/enums/Status.java | 1 -
.../dolphinscheduler/api/k8s/K8sClientService.java | 18 -----
.../api/metrics/ApiServerMetrics.java | 15 -----
.../api/permission/PermissionCheck.java | 67 -------------------
.../permission/ResourcePermissionCheckService.java | 12 ++--
.../ResourcePermissionCheckServiceImpl.java | 18 ++---
.../api/service/impl/BaseServiceImpl.java | 13 ----
.../api/service/impl/UsersServiceImpl.java | 77 +---------------------
.../dolphinscheduler/api/utils/CheckUtils.java | 22 -------
.../ResourcePermissionCheckServiceTest.java | 14 ++--
.../api/service/K8SNamespaceServiceTest.java | 11 ----
.../api/service/UsersServiceTest.java | 12 ----
.../dolphinscheduler/api/utils/CheckUtilsTest.java | 15 -----
.../org/apache/dolphinscheduler/dao/PluginDao.java | 9 ---
15 files changed, 20 insertions(+), 289 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
index b072fe6308..8a8a8cc102 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
@@ -22,7 +22,6 @@ import org.apache.dolphinscheduler.common.CommonConfiguration;
import org.apache.dolphinscheduler.common.lifecycle.ServerLifeCycleManager;
import
org.apache.dolphinscheduler.common.thread.DefaultUncaughtExceptionHandler;
import org.apache.dolphinscheduler.dao.DaoConfiguration;
-import org.apache.dolphinscheduler.dao.PluginDao;
import
org.apache.dolphinscheduler.plugin.datasource.api.plugin.DataSourceProcessorProvider;
import org.apache.dolphinscheduler.plugin.storage.api.StorageConfiguration;
import org.apache.dolphinscheduler.plugin.task.api.TaskPluginManager;
@@ -31,7 +30,6 @@ import
org.apache.dolphinscheduler.service.ServiceConfiguration;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -49,9 +47,6 @@ import org.springframework.context.event.EventListener;
@SpringBootApplication
public class ApiApplicationServer {
- @Autowired
- private PluginDao pluginDao;
-
public static void main(String[] args) {
ApiServerMetrics.registerUncachedException(DefaultUncaughtExceptionHandler::getUncaughtExceptionCount);
Thread.setDefaultUncaughtExceptionHandler(DefaultUncaughtExceptionHandler.getInstance());
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
index daf7026e78..3d24834bd4 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -561,7 +561,6 @@ public enum Status {
"查询工作流自定义变量信息错误"),
NO_CURRENT_OPERATING_PERMISSION(1400001, "The current user does not have
this permission.", "当前用户无此权限"),
- FUNCTION_DISABLED(1400002, "The current feature is disabled.", "当前功能已被禁用"),
SCHEDULE_TIME_NUMBER_EXCEED(1400003, "The number of complement dates
exceed 100.", "补数日期个数超过100"),
DESCRIPTION_TOO_LONG_ERROR(1400004, "description is too long error",
"描述过长"),
DELETE_WORKER_GROUP_BY_ID_FAIL_ENV(1400005,
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
index f35d95cae9..d481db8ec0 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
@@ -23,12 +23,9 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.NamespaceList;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.client.KubernetesClient;
/**
* Encapsulates all client-related operations, not involving the db
@@ -36,7 +33,6 @@ import io.fabric8.kubernetes.client.KubernetesClient;
@Component
public class K8sClientService {
- private static Yaml yaml = new Yaml();
@Autowired
private K8sManager k8sManager;
@@ -48,20 +44,6 @@ public class K8sClientService {
}
}
- public Optional<Namespace> deleteNamespaceToK8s(String name, Long
clusterCode) {
- Optional<Namespace> result = getNamespaceFromK8s(name, clusterCode);
- if (result.isPresent()) {
- KubernetesClient client = k8sManager.getK8sClient(clusterCode);
- Namespace body = new Namespace();
- ObjectMeta meta = new ObjectMeta();
- meta.setNamespace(name);
- meta.setName(name);
- body.setMetadata(meta);
- client.namespaces().delete(body);
- }
- return getNamespaceFromK8s(name, clusterCode);
- }
-
private Optional<Namespace> getNamespaceFromK8s(String name, Long
clusterCode) {
NamespaceList listNamespace =
k8sManager.getK8sClient(clusterCode).namespaces().list();
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/metrics/ApiServerMetrics.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/metrics/ApiServerMetrics.java
index f97f9afffa..322e7059cb 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/metrics/ApiServerMetrics.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/metrics/ApiServerMetrics.java
@@ -17,7 +17,6 @@
package org.apache.dolphinscheduler.api.metrics;
-import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import lombok.experimental.UtilityClass;
@@ -25,7 +24,6 @@ import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.DistributionSummary;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Timer;
@UtilityClass
public class ApiServerMetrics {
@@ -75,13 +73,6 @@ public class ApiServerMetrics {
.description("size of download resource files on api")
.register(Metrics.globalRegistry);
- static {
- Timer.builder("ds.api.response.time")
- .tag("user.id", "dummy")
- .description("response time on api")
- .register(Metrics.globalRegistry);
- }
-
public void incApiRequestCount() {
apiRequestCounter.increment();
}
@@ -110,12 +101,6 @@ public class ApiServerMetrics {
apiResourceDownloadSizeDistribution.record(size);
}
- public void recordApiResponseTime(final long milliseconds, final int
userId) {
- Metrics.globalRegistry.timer(
- "ds.api.response.time",
- "user.id", String.valueOf(userId)).record(milliseconds,
TimeUnit.MILLISECONDS);
- }
-
public void cleanUpApiResponseTimeMetricsByUserId(final int userId) {
Metrics.globalRegistry.remove(
Metrics.globalRegistry.timer(
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
index 100d53f793..6ace0b64ac 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
@@ -61,31 +61,6 @@ public class PermissionCheck<T> {
*/
private int userId;
- /**
- * permission check
- *
- * @param authorizationType authorization type
- * @param processService process dao
- */
- public PermissionCheck(AuthorizationType authorizationType, ProcessService
processService) {
- this.authorizationType = authorizationType;
- this.processService = processService;
- }
-
- /**
- * permission check
- */
- public PermissionCheck(AuthorizationType authorizationType, ProcessService
processService, T[] needChecks,
- int userId) {
- this.authorizationType = authorizationType;
- this.processService = processService;
- this.needChecks = needChecks;
- this.userId = userId;
- }
-
- /**
- * permission check
- */
public PermissionCheck(AuthorizationType authorizationType, ProcessService
processService, T[] needChecks,
int userId, Logger logger) {
this.authorizationType = authorizationType;
@@ -95,26 +70,6 @@ public class PermissionCheck<T> {
this.logger = logger;
}
- /**
- * permission check
- */
- public PermissionCheck(AuthorizationType authorizationType, ProcessService
processService,
- List<ResourceInfo> resourceList, int userId, Logger
logger) {
- this.authorizationType = authorizationType;
- this.processService = processService;
- this.resourceList = resourceList;
- this.userId = userId;
- this.logger = logger;
- }
-
- public AuthorizationType getAuthorizationType() {
- return authorizationType;
- }
-
- public void setAuthorizationType(AuthorizationType authorizationType) {
- this.authorizationType = authorizationType;
- }
-
public ProcessService getProcessService() {
return processService;
}
@@ -123,14 +78,6 @@ public class PermissionCheck<T> {
this.processService = processService;
}
- public T[] getNeedChecks() {
- return needChecks;
- }
-
- public void setNeedChecks(T[] needChecks) {
- this.needChecks = needChecks;
- }
-
public int getUserId() {
return userId;
}
@@ -147,20 +94,6 @@ public class PermissionCheck<T> {
this.resourceList = resourceList;
}
- /**
- * has permission
- *
- * @return true if has permission
- */
- public boolean hasPermission() {
- try {
- checkPermission();
- return true;
- } catch (Exception e) {
- return false;
- }
- }
-
/**
* check permission
*
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
index 86214478b0..e8a9e57f52 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
@@ -17,6 +17,8 @@
package org.apache.dolphinscheduler.api.permission;
+import org.apache.dolphinscheduler.common.enums.AuthorizationType;
+
import java.util.Set;
import org.slf4j.Logger;
@@ -50,13 +52,7 @@ public interface ResourcePermissionCheckService<T> {
* @param logger
* @return
*/
- boolean operationPermissionCheck(Object authorizationType, Integer userId,
- String permissionKey, Logger logger);
-
- /**
- * functionDisabled
- * @return
- */
- boolean functionDisabled();
+ boolean operationPermissionCheck(AuthorizationType authorizationType,
Integer userId, String permissionKey,
+ Logger logger);
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
index adfab607c6..b5596c866f 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
@@ -44,7 +44,6 @@ import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.repository.UserDao;
import org.apache.dolphinscheduler.dao.repository.WorkerGroupDao;
-import org.apache.dolphinscheduler.service.process.ProcessService;
import java.util.Arrays;
import java.util.Collections;
@@ -70,9 +69,9 @@ public class ResourcePermissionCheckServiceImpl
ApplicationContextAware {
@Autowired
- private ProcessService processService;
+ private UserDao userDao;
- public static final Map<AuthorizationType,
ResourceAcquisitionAndPermissionCheck<?>> RESOURCE_LIST_MAP =
+ static final Map<AuthorizationType,
ResourceAcquisitionAndPermissionCheck<?>> RESOURCE_LIST_MAP =
new ConcurrentHashMap<>();
@Override
@@ -100,9 +99,9 @@ public class ResourcePermissionCheckServiceImpl
}
@Override
- public boolean operationPermissionCheck(Object authorizationType, Integer
userId,
- String permissionKey, Logger
logger) {
- User user = processService.getUserById(userId);
+ public boolean operationPermissionCheck(AuthorizationType
authorizationType, Integer userId, String permissionKey,
+ Logger logger) {
+ User user = userDao.queryById(userId);
if (user == null) {
logger.error("User does not exist, userId:{}.", userId);
return false;
@@ -113,14 +112,9 @@ public class ResourcePermissionCheckServiceImpl
return
RESOURCE_LIST_MAP.get(authorizationType).permissionCheck(userId, permissionKey,
logger);
}
- @Override
- public boolean functionDisabled() {
- return false;
- }
-
@Override
public Set<Object> userOwnedResourceIdsAcquisition(Object
authorizationType, Integer userId, Logger logger) {
- User user = processService.getUserById(userId);
+ User user = userDao.queryById(userId);
if (user == null) {
logger.error("User does not exist, userId:{}.", userId);
return Collections.emptySet();
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
index 428b9527bc..8c256be6bb 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
@@ -124,19 +124,6 @@ public class BaseServiceImpl implements BaseService {
return false;
}
- /**
- * create tenant dir if not exists
- *
- * @param tenantCode tenant code
- * @throws IOException if hdfs operation exception
- */
- // @Override
- // public void createTenantDirIfNotExists(String tenantCode) throws
IOException {
- // String resourcePath = HadoopUtils.getHdfsResDir(tenantCode);
- // // init resource path
- // HadoopUtils.getInstance().mkdir(tenantCode,resourcePath);
- // }
-
/**
* Verify that the operator has permissions
*
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
index 5a3738cac1..ca991714b6 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -142,10 +142,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
// check all user params
String msg = this.checkUserParams(userName, userPassword, email,
phone);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED, msg);
- return result;
- }
if (!isAdmin(loginUser)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
@@ -315,10 +311,7 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
@Override
public Result<Object> queryUserList(User loginUser, String searchVal,
Integer pageNo, Integer pageSize) {
Result<Object> result = new Result<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
+
if (!isAdmin(loginUser)) {
log.warn("User does not have permission for this feature,
userId:{}, userName:{}.", loginUser.getId(),
loginUser.getUserName());
@@ -367,9 +360,7 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
String queue,
int state,
String timeZone) {
- if (resourcePermissionCheckService.functionDisabled()) {
- throw new ServiceException(Status.FUNCTION_DISABLED);
- }
+
if (!canOperator(loginUser, userId)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
@@ -456,10 +447,7 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
@Transactional
public Map<String, Object> deleteUserById(User loginUser, int id) throws
IOException {
Map<String, Object> result = new HashMap<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
+
// only admin can operate
if (!isAdmin(loginUser)) {
log.warn("User does not have permission for this feature,
userId:{}, userName:{}.", loginUser.getId(),
@@ -515,10 +503,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// 1. only admin can operate
if (this.check(result, !this.isAdmin(loginUser),
Status.USER_NO_OPERATION_PERM)) {
return result;
@@ -560,11 +544,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
-
if (!isAdmin(loginUser)) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
@@ -613,11 +592,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
-
// check exist
User tempUser = userMapper.selectById(userId);
if (tempUser == null) {
@@ -667,11 +641,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
-
// 1. check if user is existed
User tempUser = this.userMapper.selectById(userId);
if (tempUser == null) {
@@ -726,10 +695,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// 1. only admin can operate
if (this.check(result, !this.isAdmin(loginUser),
Status.USER_NO_OPERATION_PERM)) {
log.warn("Only admin can revoke the project permission.");
@@ -772,10 +737,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
public Map<String, Object> grantNamespaces(User loginUser, int userId,
String namespaceIds) {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// only admin can operate
if (this.check(result, !this.isAdmin(loginUser),
Status.USER_NO_OPERATION_PERM)) {
log.warn("Only admin can grant namespaces.");
@@ -826,10 +787,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// only admin can operate
if (this.check(result, !this.isAdmin(loginUser),
Status.USER_NO_OPERATION_PERM)) {
log.warn("Only admin can grant datasource.");
@@ -877,10 +834,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
Map<String, Object> result = new HashMap<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
User user = null;
if (loginUser.getUserType() == UserType.ADMIN_USER) {
user = loginUser;
@@ -928,10 +881,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
@Override
public Map<String, Object> queryAllGeneralUsers(User loginUser) {
Map<String, Object> result = new HashMap<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// only admin can operate
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM))
{
log.warn("Only admin can query all general users.");
@@ -997,10 +946,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
public Map<String, Object> unauthorizedUser(User loginUser, Integer
alertgroupId) {
Map<String, Object> result = new HashMap<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// only admin can operate
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM))
{
log.warn("Only admin can deauthorize user.");
@@ -1038,10 +983,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
@Override
public Map<String, Object> authorizedUser(User loginUser, Integer
alertGroupId) {
Map<String, Object> result = new HashMap<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
// only admin can operate
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM))
{
log.warn("Only admin can authorize user.");
@@ -1102,10 +1043,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
// check user params
String msg = this.checkUserParams(userName, userPassword, email, "");
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
if (!StringUtils.isEmpty(msg)) {
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, msg);
return result;
@@ -1132,10 +1069,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
public Map<String, Object> activateUser(User loginUser, String userName) {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
if (!isAdmin(loginUser)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
@@ -1180,10 +1113,6 @@ public class UsersServiceImpl extends BaseServiceImpl
implements UsersService {
public Map<String, Object> batchActivateUser(User loginUser, List<String>
userNames) {
Map<String, Object> result = new HashMap<>();
- if (resourcePermissionCheckService.functionDisabled()) {
- putMsg(result, Status.FUNCTION_DISABLED);
- return result;
- }
if (!isAdmin(loginUser)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
index 8b166a16dd..43f6eb8954 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
@@ -20,16 +20,12 @@ package org.apache.dolphinscheduler.api.utils;
import static
org.apache.dolphinscheduler.common.constants.Constants.USER_PASSWORD_MAX_LENGTH;
import static
org.apache.dolphinscheduler.common.constants.Constants.USER_PASSWORD_MIN_LENGTH;
-import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.common.constants.Constants;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.commons.lang3.StringUtils;
-import java.text.MessageFormat;
import java.time.ZoneId;
-import java.util.HashMap;
-import java.util.Map;
import java.util.regex.Pattern;
import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator;
@@ -73,24 +69,6 @@ public class CheckUtils {
return domainString.contains(".");
}
- /**
- * check project description
- *
- * @param desc desc
- * @return true if description regex valid, otherwise return false
- */
- public static Map<String, Object> checkDesc(String desc) {
- Map<String, Object> result = new HashMap<>();
- if (!StringUtils.isEmpty(desc) && desc.length() > 200) {
- result.put(Constants.STATUS,
Status.REQUEST_PARAMS_NOT_VALID_ERROR);
- result.put(Constants.MSG,
-
MessageFormat.format(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getMsg(), "desc
length"));
- } else {
- result.put(Constants.STATUS, Status.SUCCESS);
- }
- return result;
- }
-
/**
* check extra info
*
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceTest.java
index 457bd90a91..3710a130ae 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceTest.java
@@ -23,7 +23,7 @@ import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
-import org.apache.dolphinscheduler.service.process.ProcessService;
+import org.apache.dolphinscheduler.dao.repository.UserDao;
import java.util.Arrays;
import java.util.List;
@@ -48,7 +48,7 @@ public class ResourcePermissionCheckServiceTest {
private static final Logger logger =
LoggerFactory.getLogger(ResourcePermissionCheckServiceTest.class);
@Mock
- private ProcessService processService;
+ private UserDao userDao;
@Mock
private ProjectMapper projectMapper;
@@ -88,11 +88,11 @@ public class ResourcePermissionCheckServiceTest {
public void testOperationPermissionCheck() {
User user = getGeneralUser();
-
Mockito.when(processService.getUserById(user.getId())).thenReturn(null);
+ Mockito.when(userDao.queryById(user.getId())).thenReturn(null);
Assertions.assertFalse(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.PROJECTS,
user.getId(), ApiFuncIdentificationConstant.PROJECT, logger));
-
Mockito.when(processService.getUserById(user.getId())).thenReturn(user);
+ Mockito.when(userDao.queryById(user.getId())).thenReturn(user);
Assertions.assertTrue(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.PROJECTS,
user.getId(), ApiFuncIdentificationConstant.PROJECT, logger));
}
@@ -100,20 +100,20 @@ public class ResourcePermissionCheckServiceTest {
@Test
public void testUserOwnedResourceIdsAcquisition() {
User generalUser = getGeneralUser();
-
Mockito.when(processService.getUserById(generalUser.getId())).thenReturn(null);
+ Mockito.when(userDao.queryById(generalUser.getId())).thenReturn(null);
Assertions.assertEquals(0, resourcePermissionCheckService
.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS,
generalUser.getId(), logger).size());
// GENERAL_USER
List<Project> projects = Arrays.asList(getProject(1), getProject(2),
getProject(3));
-
Mockito.when(processService.getUserById(generalUser.getId())).thenReturn(generalUser);
+
Mockito.when(userDao.queryById(generalUser.getId())).thenReturn(generalUser);
Mockito.when(projectMapper.listAuthorizedProjects(generalUser.getId(),
null)).thenReturn(projects);
Assertions.assertEquals(3, resourcePermissionCheckService
.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS,
generalUser.getId(), logger).size());
// ADMIN_USER
User adminUser = getAdminUser();
-
Mockito.when(processService.getUserById(adminUser.getId())).thenReturn(adminUser);
+
Mockito.when(userDao.queryById(adminUser.getId())).thenReturn(adminUser);
Mockito.when(projectMapper.listAuthorizedProjects(0,
null)).thenReturn(projects);
Assertions.assertEquals(3, resourcePermissionCheckService
.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS,
adminUser.getId(), logger).size());
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/K8SNamespaceServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/K8SNamespaceServiceTest.java
index 6cc6f0d324..de5e48b589 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/K8SNamespaceServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/K8SNamespaceServiceTest.java
@@ -40,9 +40,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
@@ -81,15 +79,6 @@ public class K8SNamespaceServiceTest {
private String namespace = "default";
private Long clusterCode = 100L;
- @BeforeEach
- public void setUp() throws Exception {
-
Mockito.when(k8sClientService.deleteNamespaceToK8s(Mockito.anyString(),
Mockito.anyLong())).thenReturn(null);
- }
-
- @AfterEach
- public void tearDown() throws Exception {
- }
-
@Test
public void queryListPaging() {
IPage<K8sNamespace> page = new Page<>(1, 10);
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
index f3b0454c0a..575c2591d9 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
@@ -55,9 +55,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
@@ -125,16 +123,6 @@ public class UsersServiceTest {
private static final Logger serviceLogger =
LoggerFactory.getLogger(BaseServiceImpl.class);
- @BeforeEach
- public void before() {
-
Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false);
- }
-
- @AfterEach
- public void after() {
-
- }
-
@Test
public void testCreateUserForLdap() {
String userName = "user1";
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
index bca8a69a16..473c1b606d 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
@@ -17,11 +17,6 @@
package org.apache.dolphinscheduler.api.utils;
-import org.apache.dolphinscheduler.api.enums.Status;
-import org.apache.dolphinscheduler.common.constants.Constants;
-
-import java.util.Map;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -48,16 +43,6 @@ public class CheckUtilsTest {
Assertions.assertTrue(CheckUtils.checkEmail("[email protected]"));
}
- /**
- * check desc
- */
- @Test
- public void testCheckDesc() {
- Map<String, Object> objectMap = CheckUtils.checkDesc("I am desc");
- Status status = (Status) objectMap.get(Constants.STATUS);
- Assertions.assertEquals(status.getCode(), Status.SUCCESS.getCode());
- }
-
@Test
public void testCheckOtherParams() {
Assertions.assertFalse(CheckUtils.checkOtherParams(null));
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
index 24cb022881..a9424c6a8e 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
@@ -88,13 +88,4 @@ public class PluginDao {
return currPluginDefine.getId();
}
- /**
- * query plugin define by id
- *
- * @param pluginDefineId plugin define id
- * @return PluginDefine
- */
- public PluginDefine getPluginDefineById(int pluginDefineId) {
- return pluginDefineMapper.selectById(pluginDefineId);
- }
}
