Commit 15ae4dfa authored by samz406's avatar samz406 Committed by khadgarmage
Browse files

fix get tenantCode my NPE (#1684) 

* modify UdfFuncServiceTest UT

* fix get tenantCode my NPE

* add  ResourcesServiceTest

* add error log
parent dad643db

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

+47 −10
Original line number Diff line number Diff line
@@ -234,6 +234,12 @@ public class ResourcesService extends BaseService { 
            }

        }



        // query tenant by user id

        String tenantCode = getTenantCode(resource.getUserId(),result);

        if (StringUtils.isEmpty(tenantCode)){

            return result;

        }



        //get the file suffix

        String originResourceName = resource.getAlias();

        String suffix = originResourceName.substring(originResourceName.lastIndexOf("."));
@@ -271,10 +277,6 @@ public class ResourcesService extends BaseService { 
            return result;

        }



        // hdfs move

        // query tenant by user id

        User user = userMapper.queryDetailsById(resource.getUserId());

        String tenantCode = tenantMapper.queryById(user.getTenantId()).getTenantCode();

        // get file hdfs path

        // delete hdfs file by type

        String originHdfsFileName = "";
@@ -430,10 +432,15 @@ public class ResourcesService extends BaseService { 
            return result;

        }



        String tenantCode = tenantMapper.queryById(loginUser.getTenantId()).getTenantCode();

        Tenant tenant = tenantMapper.queryById(loginUser.getTenantId());

        if (tenant == null){

            putMsg(result, Status.TENANT_NOT_EXIST);

            return result;

        }

        String hdfsFilename = "";



        // delete hdfs file by type

        String tenantCode = tenant.getTenantCode();

        hdfsFilename = getHdfsFileName(resource, tenantCode, hdfsFilename);



        //delete data in database
@@ -522,8 +529,11 @@ public class ResourcesService extends BaseService { 
            }

        }



        User user = userMapper.queryDetailsById(resource.getUserId());

        String tenantCode = tenantMapper.queryById(user.getTenantId()).getTenantCode();

        String tenantCode = getTenantCode(resource.getUserId(),result);

        if (StringUtils.isEmpty(tenantCode)){

            return  result;

        }



        // hdfs path

        String hdfsFileName = HadoopUtils.getHdfsFilename(tenantCode, resource.getAlias());

        logger.info("resource hdfs path is {} ", hdfsFileName);
@@ -644,18 +654,20 @@ public class ResourcesService extends BaseService { 
        if (StringUtils.isNotEmpty(resourceViewSuffixs)) {

            List<String> strList = Arrays.asList(resourceViewSuffixs.split(","));

            if (!strList.contains(nameSuffix)) {

                logger.error("resouce suffix {} not support updateProcessInstance,  resource id {}", nameSuffix, resourceId);

                logger.error("resource suffix {} not support updateProcessInstance,  resource id {}", nameSuffix, resourceId);

                putMsg(result, Status.RESOURCE_SUFFIX_NOT_SUPPORT_VIEW);

                return result;

            }

        }



        String tenantCode = getTenantCode(resource.getUserId(),result);

        if (StringUtils.isEmpty(tenantCode)){

            return  result;

        }

        resource.setSize(content.getBytes().length);

        resource.setUpdateTime(new Date());

        resourcesMapper.updateById(resource);



        User user = userMapper.queryDetailsById(resource.getUserId());

        String tenantCode = tenantMapper.queryById(user.getTenantId()).getTenantCode();



        result = uploadContentToHdfs(resource.getAlias(), tenantCode, content);

        if (!result.getCode().equals(Status.SUCCESS.getCode())) {
@@ -897,4 +909,29 @@ public class ResourcesService extends BaseService { 
        }

    }



    /**

     * get tenantCode by UserId

     *

     * @param userId user id

     * @param result return result

     * @return

     */

    private String getTenantCode(int userId,Result result){



        User user = userMapper.queryDetailsById(userId);

        if(user == null){

            logger.error("user {} not exists", userId);

            putMsg(result, Status.USER_NOT_EXIST,userId);

            return null;

        }



        Tenant tenant = tenantMapper.queryById(user.getTenantId());

        if (tenant == null){

            logger.error("tenant not exists");

            putMsg(result, Status.TENANT_NOT_EXIST);

            return null;

        }

        return tenant.getTenantCode();

    }



}

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java

+575 −12

File changed.

Preview size limit exceeded, changes collapsed.

pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ 
						<include>**/api/service/ProjectServiceTest.java</include>

						<include>**/api/service/ProcessDefinitionServiceTest.java</include>

						<include>**/api/service/UdfFuncServiceTest.java</include>

						<include>**/api/service/ResourcesServiceTest.java</include>

						<include>**/alert/utils/ExcelUtilsTest.java</include>

						<include>**/alert/utils/FuncUtilsTest.java</include>

						<include>**/alert/utils/JSONUtilsTest.java</include>