This is an automated email from the ASF dual-hosted git repository.
jinyleechina 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 3e8fe68 Remove unused parameter in function genTaskCodeList (#6395)
3e8fe68 is described below
commit 3e8fe681283ed90c370ba2edb65f35f4c111532d
Author: Jiajie Zhong <[email protected]>
AuthorDate: Wed Sep 29 11:42:48 2021 +0800
Remove unused parameter in function genTaskCodeList (#6395)
---
.../dolphinscheduler/api/controller/TaskDefinitionController.java | 2 +-
.../apache/dolphinscheduler/api/service/TaskDefinitionService.java | 4 +---
.../dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java | 2 +-
.../dolphinscheduler/api/service/TaskDefinitionServiceImplTest.java | 5 +----
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
index fd2bf3e..a8ec2f5 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
@@ -307,7 +307,7 @@ public class TaskDefinitionController extends
BaseController {
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result genTaskCodeList(@ApiIgnore @RequestAttribute(value =
Constants.SESSION_USER) User loginUser,
@RequestParam("genNum") Integer genNum) {
- Map<String, Object> result =
taskDefinitionService.genTaskCodeList(loginUser, genNum);
+ Map<String, Object> result =
taskDefinitionService.genTaskCodeList(genNum);
return returnDataList(result);
}
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskDefinitionService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskDefinitionService.java
index 32fe150..e174329 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskDefinitionService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskDefinitionService.java
@@ -151,11 +151,9 @@ public interface TaskDefinitionService {
/**
* gen task code list
*
- * @param loginUser login user
* @param genNum gen num
* @return task code list
*/
- Map<String, Object> genTaskCodeList(User loginUser,
- Integer genNum);
+ Map<String, Object> genTaskCodeList(Integer genNum);
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
index 38ad7b1..cc63bbc 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
@@ -411,7 +411,7 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
}
@Override
- public Map<String, Object> genTaskCodeList(User loginUser, Integer genNum)
{
+ public Map<String, Object> genTaskCodeList(Integer genNum) {
Map<String, Object> result = new HashMap<>();
if (genNum == null || genNum < 1 || genNum > 100) {
logger.error("the genNum must be great than 1 and less than 100");
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskDefinitionServiceImplTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskDefinitionServiceImplTest.java
index d4e635b..1651950 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskDefinitionServiceImplTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskDefinitionServiceImplTest.java
@@ -270,10 +270,7 @@ public class TaskDefinitionServiceImplTest {
@Test
public void genTaskCodeList() {
- User loginUser = new User();
- loginUser.setId(-1);
- loginUser.setUserType(UserType.GENERAL_USER);
- Map<String, Object> genTaskCodeList =
taskDefinitionService.genTaskCodeList(loginUser, 10);
+ Map<String, Object> genTaskCodeList =
taskDefinitionService.genTaskCodeList(10);
Assert.assertEquals(Status.SUCCESS,
genTaskCodeList.get(Constants.STATUS));
}
}
\ No newline at end of file