Commit 24120a46 authored by simon824's avatar simon824
Browse files

fix the bad code smell

parent cfecfb79

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import org.apache.dolphinscheduler.common.enums.ShowType; 
import org.apache.dolphinscheduler.common.utils.StringUtils;

import org.apache.dolphinscheduler.common.utils.*;



import com.google.common.reflect.TypeToken;

import org.apache.dolphinscheduler.plugin.model.AlertData;

import org.apache.http.HttpEntity;

import org.apache.http.client.methods.CloseableHttpResponse;

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

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ public class DataSourceService extends BaseService{ 
        }



        if(logger.isDebugEnabled()){

            logger.info("parameters map-----" + JSONUtils.toJsonString(parameterMap));

            logger.info("parameters map:{}", JSONUtils.toJsonString(parameterMap));

        }

        return JSONUtils.toJsonString(parameterMap);

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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package org.apache.dolphinscheduler.api.service; 
import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.JsonNode;

import com.fasterxml.jackson.databind.node.ArrayNode;

import com.fasterxml.jackson.databind.node.ObjectNode;

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

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.api.service; 


import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.fasterxml.jackson.core.type.TypeReference;

import org.apache.dolphinscheduler.api.dto.gantt.GanttDto;

import org.apache.dolphinscheduler.api.dto.gantt.Task;

import org.apache.dolphinscheduler.api.enums.Status;
@@ -554,8 +553,7 @@ public class ProcessInstanceService extends BaseDAGService { 
            String localParams = map.get(LOCAL_PARAMS);

            if (localParams != null && !localParams.isEmpty()) {

                localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams);

                List<Property> localParamsList = new ArrayList<>();

                localParamsList = JSONUtils.toList(localParams, Property.class);

                List<Property> localParamsList = JSONUtils.toList(localParams, Property.class);



                Map<String,Object> localParamsMap = new HashMap<>();

                localParamsMap.put("taskType",taskNode.getType());

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

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ public class ResourcesService extends BaseService { 
        }

        List<Resource> allResourceList = resourcesMapper.queryResourceListAuthored(userId, type.ordinal(),0);

        Visitor resourceTreeVisitor = new ResourceTreeVisitor(allResourceList);

        //JSONArray jsonArray = JSONUtils.toList(JSONUtils.toJsonString(resourceTreeVisitor.visit().getChildren(), SerializerFeature.SortField));

        result.put(Constants.DATA_LIST, resourceTreeVisitor.visit().getChildren());

        putMsg(result,Status.SUCCESS);
@@ -1127,7 +1126,8 @@ public class ResourcesService extends BaseService { 
        }

        List<Resource> authedResources = resourcesMapper.queryAuthorizedResourceList(userId);

        Visitor visitor = new ResourceTreeVisitor(authedResources);

        logger.info(JSONUtils.toJsonString(visitor.visit(), SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS));

        String visit = JSONUtils.toJsonString(visitor.visit(), SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);

        logger.info(visit);

        String jsonTreeStr = JSONUtils.toJsonString(visitor.visit().getChildren(), SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);

        logger.info(jsonTreeStr);

        result.put(Constants.DATA_LIST, visitor.visit().getChildren());