Commit a80e9027 authored by Yelli's avatar Yelli Committed by qiaozhanwei
Browse files

fix sonar bug: not enough arguments (#1687) 

* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition

* fix sonar bug: not enough arguments
parent a9cd31ec

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class DataAnalysisController extends BaseController{ 
    public Result countQueueState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,

                                    @RequestParam(value="projectId", required=false, defaultValue = "0") int projectId){

        try{

            logger.info("count command state, user:{}, start date: {}, end date:{}, project id {}",

            logger.info("count command state, user:{}, project id {}",

                    loginUser.getUserName(), projectId);

            Map<String, Object> result = dataAnalysisService.countQueueState(loginUser, projectId);

            return returnDataList(result);

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ public class DataSourceController extends BaseController { 
    @GetMapping(value="/kerberos-startup-state")

    @ResponseStatus(HttpStatus.OK)

    public Result getKerberosStartupState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser){

        logger.info("login user {},get kerberos startup state : {}", loginUser.getUserName());

        logger.info("login user {}", loginUser.getUserName());

        try{

            // if upload resource is HDFS and kerberos startup is true , else false

            return success(Status.SUCCESS.getMsg(), CommonUtils.getKerberosStartupState());

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class TenantController extends BaseController{ 
    @GetMapping(value="/list")

    @ResponseStatus(HttpStatus.OK)

    public Result queryTenantlist(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser){

        logger.info("login user {}, query tenant list");

        logger.info("login user {}, query tenant list", loginUser.getUserName());

        try{

            Map<String, Object> result = tenantService.queryTenantList(loginUser);

            return returnDataList(result);

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ public class UsersController extends BaseController{ 
    @GetMapping(value="/get-user-info")

    @ResponseStatus(HttpStatus.OK)

    public Result getUserInfo(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser){

        logger.info("login user {},get user info : {}", loginUser.getUserName());

        logger.info("login user {},get user info", loginUser.getUserName());

        try{

            Map<String, Object> result = usersService.getUserInfo(loginUser);

            return returnDataList(result);
@@ -344,7 +344,7 @@ public class UsersController extends BaseController{ 
    @GetMapping(value="/list")

    @ResponseStatus(HttpStatus.OK)

    public Result listUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser){

        logger.info("login user {}, user list");

        logger.info("login user {}, user list", loginUser.getUserName());

        try{

            Map<String, Object> result = usersService.queryAllGeneralUsers(loginUser);

            return returnDataList(result);
@@ -364,7 +364,7 @@ public class UsersController extends BaseController{ 
    @GetMapping(value="/list-all")

    @ResponseStatus(HttpStatus.OK)

    public Result listAll(@RequestAttribute(value = Constants.SESSION_USER) User loginUser){

        logger.info("login user {}, user list");

        logger.info("login user {}, user list", loginUser.getUserName());

        try{

            Map<String, Object> result = usersService.queryUserList(loginUser);

            return returnDataList(result);

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java

+2 −2
Original line number Diff line number Diff line
@@ -374,12 +374,12 @@ public class SchedulerService extends BaseService { 
        try {

            switch (scheduleStatus) {

                case ONLINE: {

                    logger.info("Call master client set schedule online, project id: {}, flow id: {},host: {}, port: {}", project.getId(), processDefinition.getId(), masterServers);

                    logger.info("Call master client set schedule online, project id: {}, flow id: {},host: {}", project.getId(), processDefinition.getId(), masterServers);

                    setSchedule(project.getId(), id);

                    break;

                }

                case OFFLINE: {

                    logger.info("Call master client set schedule offline, project id: {}, flow id: {},host: {}, port: {}", project.getId(), processDefinition.getId(), masterServers);

                    logger.info("Call master client set schedule offline, project id: {}, flow id: {},host: {}", project.getId(), processDefinition.getId(), masterServers);

                    deleteSchedule(project.getId(), id);

                    break;

                }