Commit 4d1abb3f authored by Tboy's avatar Tboy Committed by qiaozhanwei
Browse files

remove commons-lang3 dependancy (#1709) 

* remove commons-lang3 dependancy

* remove commons-lang3 dependancy

* remove unused import
parent 5f145efa

dolphinscheduler-api/pom.xml

+0 −5
Original line number Diff line number Diff line
@@ -162,11 +162,6 @@ 
      <artifactId>commons-collections</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.commons</groupId>

      <artifactId>commons-lang3</artifactId>

    </dependency>



    <dependency>

      <groupId>org.quartz-scheduler</groupId>

      <artifactId>quartz</artifactId>

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.api.configuration; 
import com.google.common.collect.Multimap;

import io.swagger.models.*;

import io.swagger.models.parameters.Parameter;

import org.apache.commons.lang3.StringUtils;

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

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;

import org.springframework.context.MessageSource;
@@ -159,7 +159,8 @@ public class ServiceModelToSwagger2MapperImpl extends ServiceModelToSwagger2Mapp 
            Iterator<String> it = from.getTags().iterator();

            while(it.hasNext()){

               String tag = it.next();

               list.add(StringUtils.isNotBlank(tag) ? messageSource.getMessage(tag, null, tag, locale) : " ");

               list.add(

                   StringUtils.isNotBlank(tag) ? messageSource.getMessage(tag, null, tag, locale) : " ");

            }



            operation.setTags(list);

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

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import org.apache.dolphinscheduler.api.enums.Status; 
import org.apache.dolphinscheduler.api.utils.PageInfo;

import org.apache.dolphinscheduler.api.utils.Result;

import org.apache.dolphinscheduler.common.Constants;

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

import org.apache.dolphinscheduler.dao.entity.Resource;

import org.apache.commons.lang3.StringUtils;



import javax.servlet.http.HttpServletRequest;

import java.text.MessageFormat;
@@ -67,7 +67,7 @@ public class BaseController { 
    public static String getClientIpAddress(HttpServletRequest request) {

        String clientIp = request.getHeader(HTTP_X_FORWARDED_FOR);



        if (StringUtils.isNotEmpty(clientIp) && !StringUtils.equalsIgnoreCase(HTTP_HEADER_UNKNOWN, clientIp)) {

        if (StringUtils.isNotEmpty(clientIp) && !clientIp.equalsIgnoreCase(HTTP_HEADER_UNKNOWN)) {

            int index = clientIp.indexOf(COMMA);

            if (index != -1) {

                return clientIp.substring(0, index);
@@ -77,7 +77,7 @@ public class BaseController { 
        }



        clientIp = request.getHeader(HTTP_X_REAL_IP);

        if (StringUtils.isNotEmpty(clientIp) && !StringUtils.equalsIgnoreCase(HTTP_HEADER_UNKNOWN, clientIp)) {

        if (StringUtils.isNotEmpty(clientIp) && !clientIp.equalsIgnoreCase(HTTP_HEADER_UNKNOWN)) {

            return clientIp;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ import org.apache.dolphinscheduler.api.service.SessionService; 
import org.apache.dolphinscheduler.api.service.UsersService;

import org.apache.dolphinscheduler.api.utils.Result;

import org.apache.dolphinscheduler.common.Constants;

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

import org.apache.dolphinscheduler.dao.entity.User;

import io.swagger.annotations.*;

import org.apache.commons.httpclient.HttpStatus;

import org.apache.commons.lang3.StringUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
 */

package org.apache.dolphinscheduler.api.controller;



import org.apache.commons.lang3.StringUtils;

import org.apache.dolphinscheduler.api.enums.Status;

import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;

import org.apache.dolphinscheduler.api.utils.Result;

import org.apache.dolphinscheduler.common.Constants;

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

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

import org.apache.dolphinscheduler.dao.entity.User;

import io.swagger.annotations.*;

import org.slf4j.Logger;
@@ -461,7 +461,7 @@ public class ProcessDefinitionController extends BaseController{ 
            }



            if(!deleteFailedIdList.isEmpty()){

                putMsg(result, Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR,StringUtils.join(deleteFailedIdList.toArray(),","));

                putMsg(result, Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR,StringUtils.join(deleteFailedIdList,","));

            }else{

                putMsg(result, Status.SUCCESS);

            }