diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/OperatorUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/OperatorUtils.java index 8dc628b576..1b6283e0dd 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/OperatorUtils.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/OperatorUtils.java @@ -126,7 +126,7 @@ public class OperatorUtils { return auditType.getAuditOperationType(); } - public static long getObjectIdentityByParma(String[] paramNameArr, Map paramsMap) { + public static long getObjectIdentityByParam(String[] paramNameArr, Map paramsMap) { for (String name : paramNameArr) { if (paramsMap.get(name) instanceof String) { String param = (String) paramsMap.get(name); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/BaseAuditOperator.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/BaseAuditOperator.java index 0ab607da65..1e34ff2967 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/BaseAuditOperator.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/BaseAuditOperator.java @@ -80,14 +80,14 @@ public abstract class BaseAuditOperator implements AuditOperator { } modifyRequestParams(paramNameArr, paramsMap, auditLogList); - setObjectByParma(paramNameArr, paramsMap, auditLogList); + setObjectByParam(paramNameArr, paramsMap, auditLogList); if (auditLogList.get(0).getModelId() == null) { - auditLogList.get(0).setModelId(OperatorUtils.getObjectIdentityByParma(paramNameArr, paramsMap)); + auditLogList.get(0).setModelId(OperatorUtils.getObjectIdentityByParam(paramNameArr, paramsMap)); } } - protected void setObjectByParma(String[] paramNameArr, Map paramsMap, + protected void setObjectByParam(String[] paramNameArr, Map paramsMap, List auditLogList) { String name = paramNameArr[0]; @@ -97,7 +97,7 @@ public abstract class BaseAuditOperator implements AuditOperator { return; } - String objName = getObjectNameFromReturnIdentity(value); + String objName = getObjectNameFromIdentity(value); if (Strings.isNullOrEmpty(objName)) { auditLogList.get(0).setModelName(value.toString()); @@ -114,7 +114,7 @@ public abstract class BaseAuditOperator implements AuditOperator { auditLogList.get(0).setModelName(objName); } - protected void setObjectByParmaArr(String[] paramNameArr, Map paramsMap, + protected void setObjectByParamArr(String[] paramNameArr, Map paramsMap, List auditLogList) { AuditLog auditLog = auditLogList.get(0); @@ -127,7 +127,7 @@ public abstract class BaseAuditOperator implements AuditOperator { for (String identityString : identityArr) { long identity = toLong(identityString); - String value = getObjectNameFromReturnIdentity(identity); + String value = getObjectNameFromIdentity(identity); if (value == null) { continue; @@ -156,7 +156,7 @@ public abstract class BaseAuditOperator implements AuditOperator { protected void setObjectNameFromReturnIdentity(List auditLogList) { auditLogList - .forEach(auditLog -> auditLog.setModelName(getObjectNameFromReturnIdentity(auditLog.getModelId()))); + .forEach(auditLog -> auditLog.setModelName(getObjectNameFromIdentity(auditLog.getModelId()))); } protected void modifyObjectFromReturnObject(String[] params, Map returnObjectMap, @@ -180,7 +180,7 @@ public abstract class BaseAuditOperator implements AuditOperator { return NumberUtils.toLong(str.toString(), -1); } - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { return identity.toString(); } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertGroupAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertGroupAuditOperatorImpl.java index d9d55b71f7..65f0f491be 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertGroupAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertGroupAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class AlertGroupAuditOperatorImpl extends BaseAuditOperator { private AlertGroupMapper alertGroupMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertInstanceAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertInstanceAuditOperatorImpl.java index 428007a22b..d2c28832f0 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertInstanceAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertInstanceAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class AlertInstanceAuditOperatorImpl extends BaseAuditOperator { private AlertPluginInstanceMapper alertPluginInstanceMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ClusterAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ClusterAuditOperatorImpl.java index 41cf81fb40..4f1cabc043 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ClusterAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ClusterAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class ClusterAuditOperatorImpl extends BaseAuditOperator { private ClusterMapper clusterMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/DatasourceAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/DatasourceAuditOperatorImpl.java index 7a58cce19c..a859ab8cea 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/DatasourceAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/DatasourceAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class DatasourceAuditOperatorImpl extends BaseAuditOperator { private DataSourceMapper dataSourceMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/EnvironmentAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/EnvironmentAuditOperatorImpl.java index fc8301b048..cf8a93e366 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/EnvironmentAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/EnvironmentAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class EnvironmentAuditOperatorImpl extends BaseAuditOperator { private EnvironmentMapper environmentMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/K8SNamespaceAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/K8SNamespaceAuditOperatorImpl.java index e8bf25ef2d..9f0fe6b4e5 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/K8SNamespaceAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/K8SNamespaceAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class K8SNamespaceAuditOperatorImpl extends BaseAuditOperator { private K8sNamespaceMapper k8sNamespaceMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessAuditOperatorImpl.java index ba87229729..5a65adbe55 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessAuditOperatorImpl.java @@ -46,14 +46,14 @@ public class ProcessAuditOperatorImpl extends BaseAuditOperator { } @Override - protected void setObjectByParma(String[] paramNameArr, Map paramsMap, + protected void setObjectByParam(String[] paramNameArr, Map paramsMap, List auditLogList) { if (paramNameArr[0].equals(AuditLogConstants.CODES) || paramNameArr[0].equals(AuditLogConstants.PROCESS_DEFINITION_CODES) || paramNameArr[0].equals(AuditLogConstants.PROCESS_INSTANCE_IDS)) { - super.setObjectByParmaArr(paramNameArr, paramsMap, auditLogList); + super.setObjectByParamArr(paramNameArr, paramsMap, auditLogList); } else { - super.setObjectByParma(paramNameArr, paramsMap, auditLogList); + super.setObjectByParam(paramNameArr, paramsMap, auditLogList); } if (paramsMap.containsKey(AuditLogConstants.VERSION)) { if (paramsMap.get(AuditLogConstants.VERSION) != null) { @@ -65,7 +65,7 @@ public class ProcessAuditOperatorImpl extends BaseAuditOperator { } @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessInstanceAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessInstanceAuditOperatorImpl.java index f77ac59733..cb45d5abba 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessInstanceAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessInstanceAuditOperatorImpl.java @@ -48,17 +48,17 @@ public class ProcessInstanceAuditOperatorImpl extends BaseAuditOperator { } @Override - protected void setObjectByParma(String[] paramNameArr, Map paramsMap, + protected void setObjectByParam(String[] paramNameArr, Map paramsMap, List auditLogList) { if (paramNameArr[0].equals(AuditLogConstants.PROCESS_INSTANCE_IDS)) { - super.setObjectByParmaArr(paramNameArr, paramsMap, auditLogList); + super.setObjectByParamArr(paramNameArr, paramsMap, auditLogList); } else { - super.setObjectByParma(paramNameArr, paramsMap, auditLogList); + super.setObjectByParam(paramNameArr, paramsMap, auditLogList); } } @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { int objId = NumberUtils.toInt(identity.toString(), -1); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProjectAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProjectAuditOperatorImpl.java index 186d9df4e1..62cea94f95 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProjectAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProjectAuditOperatorImpl.java @@ -34,7 +34,7 @@ public class ProjectAuditOperatorImpl extends BaseAuditOperator { private ProjectMapper projectMapper; @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ResourceAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ResourceAuditOperatorImpl.java index f7326bca21..303f7bfdb3 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ResourceAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ResourceAuditOperatorImpl.java @@ -37,7 +37,7 @@ public class ResourceAuditOperatorImpl extends BaseAuditOperator { } @Override - protected void setObjectByParma(String[] paramNameArr, Map paramsMap, + protected void setObjectByParam(String[] paramNameArr, Map paramsMap, List auditLogList) { Object objName = getFileNameFromParam(paramNameArr, paramsMap); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ScheduleAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ScheduleAuditOperatorImpl.java index 731eaa25c7..be2ea935ed 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ScheduleAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ScheduleAuditOperatorImpl.java @@ -72,7 +72,7 @@ public class ScheduleAuditOperatorImpl extends BaseAuditOperator { } @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskAuditOperatorImpl.java index 202a56cce9..db6559b865 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskAuditOperatorImpl.java @@ -46,17 +46,17 @@ public class TaskAuditOperatorImpl extends BaseAuditOperator { } @Override - protected void setObjectByParma(String[] paramNameArr, Map paramsMap, + protected void setObjectByParam(String[] paramNameArr, Map paramsMap, List auditLogList) { - super.setObjectByParma(paramNameArr, paramsMap, auditLogList); + super.setObjectByParam(paramNameArr, paramsMap, auditLogList); if (paramsMap.containsKey(AuditLogConstants.VERSION)) { auditLogList.get(0).setDetail(paramsMap.get(AuditLogConstants.VERSION).toString()); } } @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskGroupAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskGroupAuditOperatorImpl.java index f50fef2e8d..12e42890f3 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskGroupAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskGroupAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class TaskGroupAuditOperatorImpl extends BaseAuditOperator { private TaskGroupMapper taskGroupMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskInstancesAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskInstancesAuditOperatorImpl.java index 1b8067fb0b..8d888b7e57 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskInstancesAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TaskInstancesAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class TaskInstancesAuditOperatorImpl extends BaseAuditOperator { private TaskInstanceMapper taskInstanceMapper; @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TenantAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TenantAuditOperatorImpl.java index 4dd80bc422..f76ddd4124 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TenantAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TenantAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class TenantAuditOperatorImpl extends BaseAuditOperator { private TenantMapper tenantMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TokenAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TokenAuditOperatorImpl.java index 39c5a4f2f7..96f1964996 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TokenAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/TokenAuditOperatorImpl.java @@ -54,7 +54,7 @@ public class TokenAuditOperatorImpl extends BaseAuditOperator { } @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UdfFunctionAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UdfFunctionAuditOperatorImpl.java index 9a185621df..2e7b9ae274 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UdfFunctionAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UdfFunctionAuditOperatorImpl.java @@ -33,7 +33,7 @@ public class UdfFunctionAuditOperatorImpl extends BaseAuditOperator { private UdfFuncMapper udfFuncMapper; @Override - protected String getObjectNameFromReturnIdentity(Object identity) { + protected String getObjectNameFromIdentity(Object identity) { int objId = NumberUtils.toInt(identity.toString(), -1); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UserAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UserAuditOperatorImpl.java index 88db6923cd..bbce39cb02 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UserAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/UserAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class UserAuditOperatorImpl extends BaseAuditOperator { private UserMapper userMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/WorkerGroupAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/WorkerGroupAuditOperatorImpl.java index e576a64474..f7a2642904 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/WorkerGroupAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/WorkerGroupAuditOperatorImpl.java @@ -48,7 +48,7 @@ public class WorkerGroupAuditOperatorImpl extends BaseAuditOperator { } @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/YarnQueueAuditOperatorImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/YarnQueueAuditOperatorImpl.java index cf7608bb61..25b15f09e1 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/YarnQueueAuditOperatorImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/YarnQueueAuditOperatorImpl.java @@ -31,7 +31,7 @@ public class YarnQueueAuditOperatorImpl extends BaseAuditOperator { private QueueMapper queueMapper; @Override - public String getObjectNameFromReturnIdentity(Object identity) { + public String getObjectNameFromIdentity(Object identity) { Long objId = toLong(identity); if (objId == -1) { return ""; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/sources/HdfsSourceGenerator.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/sources/HdfsSourceGenerator.java index ba52e07799..26b24780c1 100755 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/sources/HdfsSourceGenerator.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/sources/HdfsSourceGenerator.java @@ -57,7 +57,7 @@ public class HdfsSourceGenerator implements ISourceGenerator { } } } catch (Exception e) { - log.error(String.format("Sqoop hdfs source parmas build failed: [%s]", e.getMessage())); + log.error(String.format("Sqoop hdfs source params build failed: [%s]", e.getMessage())); } return hdfsSourceSb.toString(); diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-linkis.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-linkis.ts index b55b6eb7ec..d4028d8d0f 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-linkis.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-linkis.ts @@ -23,7 +23,7 @@ export function useLinkis(model: { [field: string]: any }): IJsonItem[] { const { t } = useI18n() const configEditorSpan = computed(() => (model.useCustom ? 24 : 0)) - const parmaEditorSpan = computed(() => (model.useCustom ? 0 : 24)) + const paramEditorSpan = computed(() => (model.useCustom ? 0 : 24)) computed(() => (model.useCustom ? 0 : 24)) return [ { @@ -35,7 +35,7 @@ export function useLinkis(model: { [field: string]: any }): IJsonItem[] { type: 'custom-parameters', field: 'paramScript', name: t('project.node.option_parameters'), - span: parmaEditorSpan, + span: paramEditorSpan, children: [ { type: 'input',