[Improve][core] Change all common lang packages to common lang3 packa…

…ges. (#1346)
DTStack · Oct 24, 2022 · 57437ce · 57437ce
1 parent 2c88dea
commit 57437ce
Show file tree

Hide file tree

Showing 86 changed files with 105 additions and 110 deletions.
diff --git a/...clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java b/...clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java
@@ -32,7 +32,7 @@
 import org.apache.flink.yarn.YarnClientYarnClusterInformationRetriever;
 import org.apache.flink.yarn.YarnClusterDescriptor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
 import org.apache.hadoop.yarn.api.records.YarnApplicationState;

diff --git a/chunjun-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java b/chunjun-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
@@ -59,7 +59,6 @@
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.Preconditions;
 import org.apache.flink.util.ShutdownHookUtil;
-import org.apache.flink.util.StringUtils;
 import org.apache.flink.yarn.configuration.YarnConfigOptions;
 import org.apache.flink.yarn.configuration.YarnConfigOptionsInternal;
 import org.apache.flink.yarn.configuration.YarnDeploymentTarget;
@@ -69,6 +68,7 @@
 import org.apache.flink.yarn.entrypoint.YarnSessionClusterEntrypoint;
 
 import org.apache.commons.collections.ListUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
@@ -575,7 +575,7 @@ private ClusterClientProvider<ApplicationId> deployInternal(
  clusterSpecification
  .getConfiguration()
  .getString(ConfigConstant.FLINK_PLUGIN_LOAD_MODE_KEY);
- if (org.apache.commons.lang3.StringUtils.equalsIgnoreCase(
+ if (StringUtils.equalsIgnoreCase(
  pluginLoadMode, ConstantValue.SHIP_FILE_PLUGIN_LOAD_MODE)) {
  List<File> fileList =
  jobGraph.getUserArtifacts().entrySet().stream()
@@ -1074,7 +1074,7 @@ private ApplicationReport startAppMaster(
  Path remoteKrb5Path = null;
  boolean hasKrb5 = false;
  String krb5Config = configuration.get(SecurityOptions.KERBEROS_KRB5_PATH);
- if (!StringUtils.isNullOrWhitespaceOnly(krb5Config)) {
+ if (!StringUtils.isBlank(krb5Config)) {
  final File krb5 = new File(krb5Config);
  LOG.info(
  "Adding KRB5 configuration {} to the AM container local resource bucket",

diff --git a/...-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java b/...-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java
@@ -35,7 +35,7 @@
 import com.alibaba.fastsql.util.JdbcConstants;
 import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/.../main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java b/.../main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java
@@ -34,7 +34,7 @@
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

diff --git a/...assandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java b/...assandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java
@@ -34,7 +34,7 @@
 import com.datastax.driver.core.policies.DefaultRetryPolicy;
 import com.datastax.driver.core.policies.ExponentialReconnectionPolicy;
 import com.google.common.base.Preconditions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ain/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java b/...ain/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java
@@ -22,7 +22,7 @@
 import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat;
 import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class ClickhouseOutputFormatBuilder extends JdbcOutputFormatBuilder {
 

diff --git a/...in/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java b/...in/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java
@@ -26,7 +26,7 @@
 import com.dtstack.chunjun.enums.ColumnType;
 import com.dtstack.chunjun.enums.Semantic;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
 

diff --git a/...n/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java b/...n/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java
@@ -29,7 +29,7 @@
 import org.apache.flink.table.data.RowData;
 
 import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.action.search.ClearScrollRequest;
 import org.elasticsearch.action.search.ClearScrollResponse;
 import org.elasticsearch.action.search.SearchRequest;

diff --git a/...ain/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java b/...ain/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java
@@ -41,7 +41,7 @@
 import org.apache.flink.table.types.logical.RowType;
 
 import com.esotericsoftware.minlog.Log;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;

diff --git a/...nector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java b/...nector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java
@@ -20,7 +20,7 @@
 
 import com.dtstack.chunjun.connector.ftp.conf.FtpConfig;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...n-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java b/...n-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java
@@ -29,7 +29,7 @@
 
 import org.apache.flink.table.data.RowData;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -182,7 +182,7 @@ protected void deleteDataFiles(List<String> preCommitFilePathList, String path)
  String currentFilePath = "";
  try {
  for (String filePath : this.preCommitFilePathList) {
- if (org.apache.commons.lang3.StringUtils.equals(path, outputFilePath)) {
+ if (StringUtils.equals(path, outputFilePath)) {
  ftpHandler.deleteFile(filePath);
  LOG.info("delete file:{}", currentFilePath);
  }

diff --git a/...ctor-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java b/...ctor-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java
@@ -22,7 +22,7 @@
 import com.dtstack.chunjun.sink.format.FileOutputFormatBuilder;
 import com.dtstack.chunjun.throwable.ChunJunRuntimeException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * The builder of FtpOutputFormat

diff --git a/...-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java b/...-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java
@@ -40,7 +40,7 @@
 import org.apache.flink.table.data.RowData;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...tor-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java b/...tor-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java
@@ -22,7 +22,7 @@
 import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder;
 import com.dtstack.chunjun.throwable.ChunJunRuntimeException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /** @author jiangbo */
 public class FtpInputFormatBuilder extends BaseRichInputFormatBuilder<FtpInputFormat> {

diff --git a/...nnector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionFactory.java b/...nnector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionFactory.java
@@ -18,7 +18,7 @@
 
 package com.dtstack.chunjun.connector.hbase;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @company: www.dtstack.com

diff --git a/...onnector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionParser.java b/...onnector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionParser.java
@@ -17,7 +17,7 @@
  */
 package com.dtstack.chunjun.connector.hbase;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionTree.java b/...-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionTree.java
@@ -21,7 +21,7 @@
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...ase/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseColumnConverter.java b/...ase/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseColumnConverter.java
@@ -129,8 +129,8 @@ public HBaseColumnConverter(HBaseConf hBaseConf, RowType rowType) {
  columnNames.add(name);
  String[] cfAndQualifier = name.split(":");
  if (cfAndQualifier.length == 2
- && org.apache.commons.lang.StringUtils.isNotBlank(cfAndQualifier[0])
- && org.apache.commons.lang.StringUtils.isNotBlank(cfAndQualifier[1])) {
+ && StringUtils.isNotBlank(cfAndQualifier[0])
+ && StringUtils.isNotBlank(cfAndQualifier[1])) {
 
  byte[][] qualifierKeys = new byte[2][];
  qualifierKeys[0] = Bytes.toBytes(cfAndQualifier[0]);

diff --git a/...se/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseFlatRowConverter.java b/...se/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseFlatRowConverter.java
@@ -114,8 +114,8 @@ public HBaseFlatRowConverter(HBaseConf hBaseConf, RowType rowType) {
  columnNames.add(name);
  String[] cfAndQualifier = name.split(":");
  if (cfAndQualifier.length == 2
- && org.apache.commons.lang.StringUtils.isNotBlank(cfAndQualifier[0])
- && org.apache.commons.lang.StringUtils.isNotBlank(cfAndQualifier[1])) {
+ && StringUtils.isNotBlank(cfAndQualifier[0])
+ && StringUtils.isNotBlank(cfAndQualifier[1])) {
 
  byte[][] qualifierKeys = new byte[2][];
  qualifierKeys[0] = Bytes.toBytes(cfAndQualifier[0]);

diff --git a/...base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseOutputFormatBuilder.java b/...base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseOutputFormatBuilder.java
@@ -22,7 +22,7 @@
 import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder;
 
 import com.google.common.base.Preconditions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
 

diff --git a/...ase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseSinkFactoryBase.java b/...ase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseSinkFactoryBase.java
@@ -38,7 +38,7 @@
 import org.apache.flink.table.types.DataType;
 import org.apache.flink.table.types.logical.RowType;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...ase/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseInputFormatBuilder.java b/...ase/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseInputFormatBuilder.java
@@ -24,7 +24,7 @@
 
 import org.apache.flink.util.Preconditions;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseSourceFactoryBase.java b/...base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseSourceFactoryBase.java
@@ -44,7 +44,7 @@
 import org.apache.flink.table.types.DataType;
 import org.apache.flink.table.types.logical.RowType;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

diff --git a/...n-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java b/...n-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java
@@ -17,7 +17,7 @@
  */
 package com.dtstack.chunjun.connector.hdfs.enums;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Date: 2021/06/09 Company: www.dtstack.com

diff --git a/...ctor-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java b/...ctor-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java
@@ -28,7 +28,7 @@
 import org.apache.flink.table.data.GenericRowData;
 import org.apache.flink.table.data.RowData;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.io.orc.OrcFile;
 import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
@@ -65,7 +65,7 @@ public class HdfsOrcInputFormat extends BaseHdfsInputFormat {
  public HdfsOrcInputSplit[] createHdfsSplit(int minNumSplits) throws IOException {
  super.initHadoopJobConf();
  String path;
- if (org.apache.commons.lang3.StringUtils.isNotBlank(hdfsConf.getFileName())) {
+ if (StringUtils.isNotBlank(hdfsConf.getFileName())) {
  // 兼容平台逻辑
  path = hdfsConf.getPath() + ConstantValue.SINGLE_SLASH_SYMBOL + hdfsConf.getFileName();
  } else {

diff --git a/...onnector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java b/...onnector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java
@@ -17,7 +17,7 @@
  */
 package com.dtstack.chunjun.connector.hdfs.source;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.mapred.JobConf;

diff --git a/...njun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java b/...njun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java
@@ -32,7 +32,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;

diff --git a/...connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/enums/CompressType.java b/...connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/enums/CompressType.java
@@ -17,7 +17,7 @@
  */
 package com.dtstack.chunjun.connector.hive3.enums;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Date: 2021/06/09 Company: www.dtstack.com

diff --git a/...3/src/main/java/com/dtstack/chunjun/connector/hive3/sink/HdfsTransactionOutputFormat.java b/...3/src/main/java/com/dtstack/chunjun/connector/hive3/sink/HdfsTransactionOutputFormat.java
@@ -68,8 +68,7 @@ protected void openSource() {
  }
  Object hadoopUser = hdfsConf.getHadoopConfig().get(HADOOP_USER_NAME);
  // 如果配置的 hadoop 用户不为空，那么设置配置中的用户。
- if (hadoopUser != null
- && org.apache.commons.lang.StringUtils.isNotEmpty(hadoopUser.toString())) {
+ if (hadoopUser != null && StringUtils.isNotEmpty(hadoopUser.toString())) {
  currentUser = hadoopUser.toString();
  }
  conf =
@@ -117,8 +116,7 @@ public void getUgi() throws IOException {
  openKerberos = Hive3Util.isOpenKerberos(hdfsConf.getHadoopConfig());
  String currentUser = UserGroupInformation.getCurrentUser().getUserName();
  Object hadoopUser = hdfsConf.getHadoopConfig().get(HADOOP_USER_NAME);
- if (hadoopUser != null
- && org.apache.commons.lang.StringUtils.isNotEmpty(hadoopUser.toString())) {
+ if (hadoopUser != null && StringUtils.isNotEmpty(hadoopUser.toString())) {
  currentUser = hadoopUser.toString();
  }
  if (openKerberos) {

diff --git a/...or-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsOrcInputFormat.java b/...or-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsOrcInputFormat.java
@@ -29,7 +29,7 @@
 import org.apache.flink.table.data.GenericRowData;
 import org.apache.flink.table.data.RowData;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.io.orc.OrcFile;

diff --git a/...nector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsPathFilter.java b/...nector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsPathFilter.java
@@ -17,7 +17,7 @@
  */
 package com.dtstack.chunjun.connector.hive3.source;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.mapred.JobConf;

diff --git a/.../src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsTransactionInputFormat.java b/.../src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsTransactionInputFormat.java
@@ -24,7 +24,7 @@
 
 import org.apache.flink.core.io.InputSplit;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;

diff --git a/...jun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/util/Hive3Util.java b/...jun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/util/Hive3Util.java
@@ -484,7 +484,7 @@ public static boolean isOpenKerberos(Map<String, Object> hadoopConfig) {
 
  public static void setHadoopUserName(Configuration conf) {
  String hadoopUserName = conf.get(KEY_HADOOP_USER_NAME);
- if (org.apache.commons.lang.StringUtils.isEmpty(hadoopUserName)) {
+ if (StringUtils.isEmpty(hadoopUserName)) {
  return;
  }
 
@@ -503,7 +503,7 @@ public static void setHadoopUserName(Configuration conf) {
 
  private static FileSystem getFsWithUser(
  Map<String, Object> hadoopConfig, String defaultFs, String user) throws Exception {
- if (org.apache.commons.lang.StringUtils.isEmpty(user)) {
+ if (StringUtils.isEmpty(user)) {
  return FileSystem.get(getConfiguration(hadoopConfig, defaultFs));
  }
  UserGroupInformation ugi = UserGroupInformation.createRemoteUser(user);
@@ -595,7 +595,6 @@ private static Map<String, Object> fillConfig(Map<String, Object> confMap, Strin
  }
 
  private static boolean isHaMode(Map<String, Object> confMap) {
- return org.apache.commons.lang.StringUtils.isNotEmpty(
- MapUtils.getString(confMap, KEY_DFS_NAME_SERVICES));
+ return StringUtils.isNotEmpty(MapUtils.getString(confMap, KEY_DFS_NAME_SERVICES));
  }
 }
diff --git a/.../src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java b/.../src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java
@@ -31,8 +31,8 @@
 
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.text.StrBuilder;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.text.StrBuilder;
 
 import java.util.ArrayList;
 import java.util.Comparator;