github-advanced-security[bot] commented on code in PR #18233:
URL:
https://github.com/apache/dolphinscheduler/pull/18233#discussion_r3207448887
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java:
##########
@@ -124,49 +106,29 @@
.updateTime(now)
.build();
- if (taskGroupMapper.insert(taskGroup) > 0) {
- log.info("Create task group complete, taskGroupName:{}.",
taskGroup.getName());
- result.put(Constants.DATA_LIST, taskGroup);
- putMsg(result, Status.SUCCESS);
- } else {
+ if (taskGroupMapper.insert(taskGroup) <= 0) {
log.error("Create task group error, taskGroupName:{}.",
taskGroup.getName());
- putMsg(result, Status.CREATE_TASK_GROUP_ERROR);
- return result;
+ throw new ServiceException(Status.CREATE_TASK_GROUP_ERROR);
}
-
- return result;
+ log.info("Create task group complete, taskGroupName:{}.",
taskGroup.getName());
Review Comment:
## CodeQL / Log Injection
This log entry depends on a [user-provided value](1).
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5778)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java:
##########
@@ -83,12 +83,8 @@
/**
* force start Task Instance
- *
- * @param loginUser
- * @param queueId
- * @return
*/
- Map<String, Object> forceStartTaskInstance(User loginUser, int queueId);
+ void forceStartTaskInstance(User loginUser, int queueId);
Review Comment:
## CodeQL / Useless parameter
The parameter 'loginUser' is never used.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5780)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java:
##########
@@ -17,117 +17,63 @@
package org.apache.dolphinscheduler.api.service;
+import org.apache.dolphinscheduler.api.utils.PageInfo;
+import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.User;
-import java.util.Map;
-
public interface TaskGroupService {
/**
* create a Task group
- *
- * @param loginUser login user
- * @param name task group name
- * @param description task group description
- * @param groupSize task group total size
- * @return the result code and msg
*/
- Map<String, Object> createTaskGroup(User loginUser, Long projectCode,
String name,
- String description, int groupSize);
+ TaskGroup createTaskGroup(User loginUser, Long projectCode, String name,
String description, int groupSize);
/**
* update the task group
- *
- * @param loginUser login user
- * @param name task group name
- * @param description task group description
- * @param groupSize task group total size
- * @return the result code and msg
*/
- Map<String, Object> updateTaskGroup(User loginUser, int id, String name,
- String description, int groupSize);
+ TaskGroup updateTaskGroup(User loginUser, int id, String name, String
description, int groupSize);
/**
* query all task group by user id
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @return the result code and msg
*/
- Map<String, Object> queryAllTaskGroup(User loginUser, String name, Integer
status, int pageNo, int pageSize);
+ PageInfo<TaskGroup> queryAllTaskGroup(User loginUser, String name, Integer
status, int pageNo, int pageSize);
/**
* query all task group by status
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param status status
- * @return the result code and msg
*/
- Map<String, Object> queryTaskGroupByStatus(User loginUser, int pageNo, int
pageSize, int status);
+ PageInfo<TaskGroup> queryTaskGroupByStatus(User loginUser, int pageNo, int
pageSize, int status);
/**
- * query all task group by name
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param projectCode project code
- * @return the result code and msg
+ * query all task group by project code
*/
- Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int
pageNo, int pageSize, Long projectCode);
+ PageInfo<TaskGroup> queryTaskGroupByProjectCode(User loginUser, int
pageNo, int pageSize, Long projectCode);
/**
- * query all task group by id
- *
- * @param loginUser login user
- * @param id id
- * @return the result code and msg
+ * query task group by id (returns null if not found)
*/
- Map<String, Object> queryTaskGroupById(User loginUser, int id);
+ TaskGroup queryTaskGroupById(User loginUser, int id);
Review Comment:
## CodeQL / Useless parameter
The parameter 'loginUser' is never used.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5783)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java:
##########
@@ -17,117 +17,63 @@
package org.apache.dolphinscheduler.api.service;
+import org.apache.dolphinscheduler.api.utils.PageInfo;
+import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.User;
-import java.util.Map;
-
public interface TaskGroupService {
/**
* create a Task group
- *
- * @param loginUser login user
- * @param name task group name
- * @param description task group description
- * @param groupSize task group total size
- * @return the result code and msg
*/
- Map<String, Object> createTaskGroup(User loginUser, Long projectCode,
String name,
- String description, int groupSize);
+ TaskGroup createTaskGroup(User loginUser, Long projectCode, String name,
String description, int groupSize);
/**
* update the task group
- *
- * @param loginUser login user
- * @param name task group name
- * @param description task group description
- * @param groupSize task group total size
- * @return the result code and msg
*/
- Map<String, Object> updateTaskGroup(User loginUser, int id, String name,
- String description, int groupSize);
+ TaskGroup updateTaskGroup(User loginUser, int id, String name, String
description, int groupSize);
/**
* query all task group by user id
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @return the result code and msg
*/
- Map<String, Object> queryAllTaskGroup(User loginUser, String name, Integer
status, int pageNo, int pageSize);
+ PageInfo<TaskGroup> queryAllTaskGroup(User loginUser, String name, Integer
status, int pageNo, int pageSize);
/**
* query all task group by status
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param status status
- * @return the result code and msg
*/
- Map<String, Object> queryTaskGroupByStatus(User loginUser, int pageNo, int
pageSize, int status);
+ PageInfo<TaskGroup> queryTaskGroupByStatus(User loginUser, int pageNo, int
pageSize, int status);
/**
- * query all task group by name
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param projectCode project code
- * @return the result code and msg
+ * query all task group by project code
*/
- Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int
pageNo, int pageSize, Long projectCode);
+ PageInfo<TaskGroup> queryTaskGroupByProjectCode(User loginUser, int
pageNo, int pageSize, Long projectCode);
/**
- * query all task group by id
- *
- * @param loginUser login user
- * @param id id
- * @return the result code and msg
+ * query task group by id (returns null if not found)
*/
- Map<String, Object> queryTaskGroupById(User loginUser, int id);
+ TaskGroup queryTaskGroupById(User loginUser, int id);
/**
- * query
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param userId user id
- * @param name name
- * @param status status
- * @return the result code and msg
+ * paginated query of task groups
*/
- Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize, int
userId, String name, Integer status);
+ PageInfo<TaskGroup> doQuery(User loginUser, int pageNo, int pageSize, int
userId, String name, Integer status);
Review Comment:
## CodeQL / Useless parameter
The parameter 'userId' is never used.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5782)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java:
##########
@@ -36,20 +39,37 @@
public class ApiExceptionHandler {
@ExceptionHandler(ServiceException.class)
- public Result<Object> exceptionHandler(ServiceException e, HandlerMethod
hm) {
+ public ResponseEntity<Result<Object>> exceptionHandler(ServiceException e,
HandlerMethod hm) {
log.error("{} Meet a ServiceException: {}", hm.getShortLogMessage(),
e.getMessage());
- return new Result<>(e.getCode(), e.getMessage());
+ return ResponseEntity.status(resolveResponseStatus(hm))
+ .body(new Result<>(e.getCode(), e.getMessage()));
}
@ExceptionHandler(Throwable.class)
- public Result<Object> exceptionHandler(Throwable e, HandlerMethod hm) {
+ public ResponseEntity<Result<Object>> exceptionHandler(Throwable e,
HandlerMethod hm) {
Review Comment:
## CodeQL / Confusing overloading of methods
Method ApiExceptionHandler.exceptionHandler(..) could be confused with
overloaded method [exceptionHandler](1), since dispatch depends on static types.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5779)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java:
##########
@@ -17,117 +17,63 @@
package org.apache.dolphinscheduler.api.service;
+import org.apache.dolphinscheduler.api.utils.PageInfo;
+import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.User;
-import java.util.Map;
-
public interface TaskGroupService {
/**
* create a Task group
- *
- * @param loginUser login user
- * @param name task group name
- * @param description task group description
- * @param groupSize task group total size
- * @return the result code and msg
*/
- Map<String, Object> createTaskGroup(User loginUser, Long projectCode,
String name,
- String description, int groupSize);
+ TaskGroup createTaskGroup(User loginUser, Long projectCode, String name,
String description, int groupSize);
/**
* update the task group
- *
- * @param loginUser login user
- * @param name task group name
- * @param description task group description
- * @param groupSize task group total size
- * @return the result code and msg
*/
- Map<String, Object> updateTaskGroup(User loginUser, int id, String name,
- String description, int groupSize);
+ TaskGroup updateTaskGroup(User loginUser, int id, String name, String
description, int groupSize);
/**
* query all task group by user id
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @return the result code and msg
*/
- Map<String, Object> queryAllTaskGroup(User loginUser, String name, Integer
status, int pageNo, int pageSize);
+ PageInfo<TaskGroup> queryAllTaskGroup(User loginUser, String name, Integer
status, int pageNo, int pageSize);
/**
* query all task group by status
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param status status
- * @return the result code and msg
*/
- Map<String, Object> queryTaskGroupByStatus(User loginUser, int pageNo, int
pageSize, int status);
+ PageInfo<TaskGroup> queryTaskGroupByStatus(User loginUser, int pageNo, int
pageSize, int status);
/**
- * query all task group by name
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param projectCode project code
- * @return the result code and msg
+ * query all task group by project code
*/
- Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int
pageNo, int pageSize, Long projectCode);
+ PageInfo<TaskGroup> queryTaskGroupByProjectCode(User loginUser, int
pageNo, int pageSize, Long projectCode);
/**
- * query all task group by id
- *
- * @param loginUser login user
- * @param id id
- * @return the result code and msg
+ * query task group by id (returns null if not found)
*/
- Map<String, Object> queryTaskGroupById(User loginUser, int id);
+ TaskGroup queryTaskGroupById(User loginUser, int id);
/**
- * query
- *
- * @param loginUser login user
- * @param pageNo page no
- * @param pageSize page size
- * @param userId user id
- * @param name name
- * @param status status
- * @return the result code and msg
+ * paginated query of task groups
*/
- Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize, int
userId, String name, Integer status);
+ PageInfo<TaskGroup> doQuery(User loginUser, int pageNo, int pageSize, int
userId, String name, Integer status);
Review Comment:
## CodeQL / Useless parameter
The parameter 'loginUser' is never used.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5781)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
