Skip to content

Commit e93ed78

Browse files
qE0a44OX6sqE0a44OX6s
authored
[Fix] Fix audit log parma typo (apache#16077)
1 parent e6c5743 commit e93ed78

24 files changed

+40
-40
lines changed

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/OperatorUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public static AuditOperationType modifyReleaseOperationType(AuditType auditType,
126126
return auditType.getAuditOperationType();
127127
}
128128

129-
public static long getObjectIdentityByParma(String[] paramNameArr, Map<String, Object> paramsMap) {
129+
public static long getObjectIdentityByParam(String[] paramNameArr, Map<String, Object> paramsMap) {
130130
for (String name : paramNameArr) {
131131
if (paramsMap.get(name) instanceof String) {
132132
String param = (String) paramsMap.get(name);

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/BaseAuditOperator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ public void setRequestParam(AuditType auditType, List<AuditLog> auditLogList, Ma
8080
}
8181

8282
modifyRequestParams(paramNameArr, paramsMap, auditLogList);
83-
setObjectByParma(paramNameArr, paramsMap, auditLogList);
83+
setObjectByParam(paramNameArr, paramsMap, auditLogList);
8484

8585
if (auditLogList.get(0).getModelId() == null) {
86-
auditLogList.get(0).setModelId(OperatorUtils.getObjectIdentityByParma(paramNameArr, paramsMap));
86+
auditLogList.get(0).setModelId(OperatorUtils.getObjectIdentityByParam(paramNameArr, paramsMap));
8787
}
8888
}
8989

90-
protected void setObjectByParma(String[] paramNameArr, Map<String, Object> paramsMap,
90+
protected void setObjectByParam(String[] paramNameArr, Map<String, Object> paramsMap,
9191
List<AuditLog> auditLogList) {
9292

9393
String name = paramNameArr[0];
@@ -97,7 +97,7 @@ protected void setObjectByParma(String[] paramNameArr, Map<String, Object> param
9797
return;
9898
}
9999

100-
String objName = getObjectNameFromReturnIdentity(value);
100+
String objName = getObjectNameFromIdentity(value);
101101

102102
if (Strings.isNullOrEmpty(objName)) {
103103
auditLogList.get(0).setModelName(value.toString());
@@ -114,7 +114,7 @@ protected void setObjectByParma(String[] paramNameArr, Map<String, Object> param
114114
auditLogList.get(0).setModelName(objName);
115115
}
116116

117-
protected void setObjectByParmaArr(String[] paramNameArr, Map<String, Object> paramsMap,
117+
protected void setObjectByParamArr(String[] paramNameArr, Map<String, Object> paramsMap,
118118
List<AuditLog> auditLogList) {
119119

120120
AuditLog auditLog = auditLogList.get(0);
@@ -127,7 +127,7 @@ protected void setObjectByParmaArr(String[] paramNameArr, Map<String, Object> pa
127127
for (String identityString : identityArr) {
128128
long identity = toLong(identityString);
129129

130-
String value = getObjectNameFromReturnIdentity(identity);
130+
String value = getObjectNameFromIdentity(identity);
131131

132132
if (value == null) {
133133
continue;
@@ -156,7 +156,7 @@ protected void setObjectIdentityFromReturnObject(AuditType auditType, Result<?>
156156

157157
protected void setObjectNameFromReturnIdentity(List<AuditLog> auditLogList) {
158158
auditLogList
159-
.forEach(auditLog -> auditLog.setModelName(getObjectNameFromReturnIdentity(auditLog.getModelId())));
159+
.forEach(auditLog -> auditLog.setModelName(getObjectNameFromIdentity(auditLog.getModelId())));
160160
}
161161

162162
protected void modifyObjectFromReturnObject(String[] params, Map<String, Object> returnObjectMap,
@@ -180,7 +180,7 @@ protected Long toLong(Object str) {
180180
return NumberUtils.toLong(str.toString(), -1);
181181
}
182182

183-
protected String getObjectNameFromReturnIdentity(Object identity) {
183+
protected String getObjectNameFromIdentity(Object identity) {
184184
return identity.toString();
185185
}
186186

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertGroupAuditOperatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class AlertGroupAuditOperatorImpl extends BaseAuditOperator {
3131
private AlertGroupMapper alertGroupMapper;
3232

3333
@Override
34-
public String getObjectNameFromReturnIdentity(Object identity) {
34+
public String getObjectNameFromIdentity(Object identity) {
3535
Long objId = toLong(identity);
3636
if (objId == -1) {
3737
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/AlertInstanceAuditOperatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class AlertInstanceAuditOperatorImpl extends BaseAuditOperator {
3131
private AlertPluginInstanceMapper alertPluginInstanceMapper;
3232

3333
@Override
34-
public String getObjectNameFromReturnIdentity(Object identity) {
34+
public String getObjectNameFromIdentity(Object identity) {
3535
Long objId = toLong(identity);
3636
if (objId == -1) {
3737
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ClusterAuditOperatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ClusterAuditOperatorImpl extends BaseAuditOperator {
3131
private ClusterMapper clusterMapper;
3232

3333
@Override
34-
public String getObjectNameFromReturnIdentity(Object identity) {
34+
public String getObjectNameFromIdentity(Object identity) {
3535
Long objId = toLong(identity);
3636
if (objId == -1) {
3737
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/DatasourceAuditOperatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class DatasourceAuditOperatorImpl extends BaseAuditOperator {
3131
private DataSourceMapper dataSourceMapper;
3232

3333
@Override
34-
public String getObjectNameFromReturnIdentity(Object identity) {
34+
public String getObjectNameFromIdentity(Object identity) {
3535
Long objId = toLong(identity);
3636
if (objId == -1) {
3737
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/EnvironmentAuditOperatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class EnvironmentAuditOperatorImpl extends BaseAuditOperator {
3131
private EnvironmentMapper environmentMapper;
3232

3333
@Override
34-
public String getObjectNameFromReturnIdentity(Object identity) {
34+
public String getObjectNameFromIdentity(Object identity) {
3535
Long objId = toLong(identity);
3636
if (objId == -1) {
3737
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/K8SNamespaceAuditOperatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class K8SNamespaceAuditOperatorImpl extends BaseAuditOperator {
3131
private K8sNamespaceMapper k8sNamespaceMapper;
3232

3333
@Override
34-
public String getObjectNameFromReturnIdentity(Object identity) {
34+
public String getObjectNameFromIdentity(Object identity) {
3535
Long objId = toLong(identity);
3636
if (objId == -1) {
3737
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessAuditOperatorImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ public void modifyAuditOperationType(AuditType auditType, Map<String, Object> pa
4646
}
4747

4848
@Override
49-
protected void setObjectByParma(String[] paramNameArr, Map<String, Object> paramsMap,
49+
protected void setObjectByParam(String[] paramNameArr, Map<String, Object> paramsMap,
5050
List<AuditLog> auditLogList) {
5151
if (paramNameArr[0].equals(AuditLogConstants.CODES)
5252
|| paramNameArr[0].equals(AuditLogConstants.PROCESS_DEFINITION_CODES)
5353
|| paramNameArr[0].equals(AuditLogConstants.PROCESS_INSTANCE_IDS)) {
54-
super.setObjectByParmaArr(paramNameArr, paramsMap, auditLogList);
54+
super.setObjectByParamArr(paramNameArr, paramsMap, auditLogList);
5555
} else {
56-
super.setObjectByParma(paramNameArr, paramsMap, auditLogList);
56+
super.setObjectByParam(paramNameArr, paramsMap, auditLogList);
5757
}
5858
if (paramsMap.containsKey(AuditLogConstants.VERSION)) {
5959
if (paramsMap.get(AuditLogConstants.VERSION) != null) {
@@ -65,7 +65,7 @@ protected void setObjectByParma(String[] paramNameArr, Map<String, Object> param
6565
}
6666

6767
@Override
68-
protected String getObjectNameFromReturnIdentity(Object identity) {
68+
protected String getObjectNameFromIdentity(Object identity) {
6969
Long objId = toLong(identity);
7070
if (objId == -1) {
7171
return "";

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProcessInstanceAuditOperatorImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ public void modifyAuditOperationType(AuditType auditType, Map<String, Object> pa
4848
}
4949

5050
@Override
51-
protected void setObjectByParma(String[] paramNameArr, Map<String, Object> paramsMap,
51+
protected void setObjectByParam(String[] paramNameArr, Map<String, Object> paramsMap,
5252
List<AuditLog> auditLogList) {
5353
if (paramNameArr[0].equals(AuditLogConstants.PROCESS_INSTANCE_IDS)) {
54-
super.setObjectByParmaArr(paramNameArr, paramsMap, auditLogList);
54+
super.setObjectByParamArr(paramNameArr, paramsMap, auditLogList);
5555
} else {
56-
super.setObjectByParma(paramNameArr, paramsMap, auditLogList);
56+
super.setObjectByParam(paramNameArr, paramsMap, auditLogList);
5757
}
5858
}
5959

6060
@Override
61-
protected String getObjectNameFromReturnIdentity(Object identity) {
61+
protected String getObjectNameFromIdentity(Object identity) {
6262
int objId = NumberUtils.toInt(identity.toString(), -1);
6363
if (objId == -1) {
6464
return "";

0 commit comments

Comments
 (0)