diff --git a/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java index f45b697836..88f245d92e 100644 --- a/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java +++ b/chunjun-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 index 7fac27ff99..d519f805dd 100644 --- 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 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 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/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java index 508a334b88..1c07d83558 100644 --- a/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java index b3bc77931a..e044db2e0b 100644 --- a/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/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/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java index 320ca83e12..f9b28d190d 100644 --- a/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java +++ b/chunjun-connectors/chunjun-connector-cassandra/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/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java index d46e8dcc3f..cba363b47d 100644 --- a/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/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/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java index 85ddf36c2f..9307c6b73a 100644 --- a/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/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/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java index 892ba11ec9..ac633607bc 100644 --- a/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/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/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java index 9d147809d5..63000c750d 100644 --- a/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/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/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java index a1b7fa4f2b..fb9fae0f70 100644 --- a/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java index 6778400f8c..d8e528b463 100644 --- a/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java +++ b/chunjun-connectors/chunjun-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 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/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java index cddb48c3ad..8337bbebc3 100644 --- a/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java index eadae9cdea..aa340fbf74 100644 --- a/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java +++ b/chunjun-connectors/chunjun-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/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java index 8ba2de4dcc..de73b8dc40 100644 --- a/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-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 { diff --git a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionFactory.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionFactory.java index c3fb7a184e..d0aa338f06 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionFactory.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionParser.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionParser.java index e22ad37292..de0746c7b0 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionParser.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionTree.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionTree.java index d97f5ffa50..09a7f7556e 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/FunctionTree.java +++ b/chunjun-connectors/chunjun-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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseColumnConverter.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseColumnConverter.java index cb5627253b..80e1d884a2 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseFlatRowConverter.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseFlatRowConverter.java index e2146d3b34..e6f69678c6 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/converter/HBaseFlatRowConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseOutputFormatBuilder.java index 037cb69a46..c8c02b782d 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hbase-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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseSinkFactoryBase.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseSinkFactoryBase.java index 046beb229c..8d3cb23933 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/sink/HBaseSinkFactoryBase.java +++ b/chunjun-connectors/chunjun-connector-hbase-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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseInputFormatBuilder.java index 603f7ca0a5..bbb4149ac1 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/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/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseSourceFactoryBase.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseSourceFactoryBase.java index 09631146c1..9078033e1d 100644 --- a/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/source/HBaseSourceFactoryBase.java +++ b/chunjun-connectors/chunjun-connector-hbase-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/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java index 9b7510c0a2..408e5df0dd 100644 --- a/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java +++ b/chunjun-connectors/chunjun-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/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java index 20a7f2752c..f6c035e11e 100644 --- a/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java index 7389bb4a02..fa272b2561 100644 --- a/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java index b4bcddf9a4..5701a95154 100644 --- a/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java +++ b/chunjun-connectors/chunjun-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/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/enums/CompressType.java b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/enums/CompressType.java index 215a73b6d5..825d368409 100644 --- a/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/enums/CompressType.java +++ b/chunjun-connectors/chunjun-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/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/sink/HdfsTransactionOutputFormat.java b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/sink/HdfsTransactionOutputFormat.java index 03312718d8..c47f657475 100644 --- a/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/sink/HdfsTransactionOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hive3/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/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsOrcInputFormat.java b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsOrcInputFormat.java index 3f9e3cee9c..3781a46d48 100644 --- a/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsOrcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsPathFilter.java b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsPathFilter.java index 27bf7f74d8..a6d1b31cdf 100644 --- a/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsPathFilter.java +++ b/chunjun-connectors/chunjun-connector-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/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsTransactionInputFormat.java b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsTransactionInputFormat.java index 58b24e46e8..e2130bfdf0 100644 --- a/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/source/HdfsTransactionInputFormat.java +++ b/chunjun-connectors/chunjun-connector-hive3/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/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/util/Hive3Util.java b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/util/Hive3Util.java index cdba40eaa2..0fd830d520 100644 --- a/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/util/Hive3Util.java +++ b/chunjun-connectors/chunjun-connector-hive3/src/main/java/com/dtstack/chunjun/connector/hive3/util/Hive3Util.java @@ -484,7 +484,7 @@ public static boolean isOpenKerberos(Map 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 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 fillConfig(Map confMap, Strin } private static boolean isHaMode(Map 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/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java index 40f738be87..af71b7a151 100644 --- a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-http/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; diff --git a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java index f8194ff5a8..371a30805e 100644 --- a/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java @@ -41,6 +41,7 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.Collections; @@ -88,8 +89,7 @@ public HttpSourceFactory(SyncConf config, StreamExecutionEnvironment env) { } } if (syncConf.getTransformer() == null - || org.apache.commons.lang3.StringUtils.isBlank( - syncConf.getTransformer().getTransformSql())) { + || StringUtils.isBlank(syncConf.getTransformer().getTransformSql())) { typeInformation = TableUtil.getTypeInformation( Collections.emptyList(), getRawTypeConverter(), true); diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java index 72b2945995..09e3081c54 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java @@ -20,7 +20,7 @@ import com.dtstack.chunjun.conf.ChunJunCommonConf; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; import java.util.List; diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java index ab54cfd7d9..355a41162f 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java @@ -22,7 +22,7 @@ import com.dtstack.chunjun.converter.AbstractRowConverter; import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java index 245e73fc0d..63f48f3ea6 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java @@ -477,7 +477,7 @@ protected String buildQuerySql(InputSplit inputSplit) { */ public String buildStartLocationSql( String incrementCol, String startLocation, boolean useMaxFunc, boolean isPolling) { - if (org.apache.commons.lang.StringUtils.isEmpty(startLocation) + if (StringUtils.isEmpty(startLocation) || JdbcUtil.NULL_STRING.equalsIgnoreCase(startLocation)) { return null; } diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java index bd37b80f71..6c515bab99 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java @@ -27,7 +27,7 @@ import com.dtstack.chunjun.enums.Semantic; import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.math.BigInteger; import java.util.Arrays; diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java index 21313fbd97..764f6a1c9a 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java @@ -22,7 +22,7 @@ import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java index 324057ca07..96794d98c2 100644 --- a/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java @@ -155,7 +155,7 @@ public static Pair, List> getTableMetaData( tableRs.close(); String tableInfo; - if (org.apache.commons.lang3.StringUtils.isNotBlank(schema)) { + if (StringUtils.isNotBlank(schema)) { tableInfo = String.format("%s.%s", schema, tableName); } else { // schema is null, use default schema to get metadata diff --git a/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java index d781ef51b0..1388d806df 100644 --- a/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java @@ -26,8 +26,8 @@ import com.dtstack.chunjun.security.KerberosUtil; import com.dtstack.chunjun.throwable.NoRestartException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.kudu.ColumnSchema; import org.apache.kudu.Type; diff --git a/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java index aa5847551d..5aa1b35461 100644 --- a/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java @@ -29,7 +29,7 @@ import com.mongodb.ServerAddress; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java index 898f95924a..28ebbbb25e 100644 --- a/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java @@ -25,7 +25,7 @@ import com.dtstack.chunjun.sink.WriteMode; import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java index 081a8e15fc..ae697768ef 100644 --- a/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java @@ -24,7 +24,7 @@ import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import com.mongodb.BasicDBObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bson.conversions.Bson; /** diff --git a/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java index 47da0eee96..370088218d 100644 --- a/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java @@ -23,7 +23,7 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class OceanbaseSourceFactory extends JdbcSourceFactory { public OceanbaseSourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { diff --git a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java index 541ecd48fd..31c55cc378 100644 --- a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java @@ -33,7 +33,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.sql.Connection; import java.sql.DriverManager; diff --git a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java index 9c8b12f4c3..463104fc00 100644 --- a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java @@ -37,8 +37,8 @@ import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java index e6883c4fe9..7de4072f89 100644 --- a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java @@ -35,7 +35,7 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @company: www.dtstack.com diff --git a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java index 1e5dd787a2..2fc212c55a 100644 --- a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java @@ -20,7 +20,8 @@ import com.dtstack.chunjun.connector.oraclelogminer.entity.ColumnInfo; import com.dtstack.chunjun.constants.ConstantValue; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -550,8 +551,7 @@ public static String getTableCommentSql(String schema, String table, String comm + quote(comment, "'"); } - public static String formatGetTableInfoSql( - List> tables) { + public static String formatGetTableInfoSql(List> tables) { String where = " and "; if (tables.size() == 1) { where += " a.OWNER = ?\n" + " and a.TABLE_NAME = ?"; diff --git a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java index 6031f6acf9..581eca0722 100644 --- a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java @@ -272,7 +272,7 @@ protected String buildStartLocationSql( String incrementCol, String startLocation, boolean useMaxFunc) { - if (org.apache.commons.lang.StringUtils.isEmpty(startLocation) + if (StringUtils.isEmpty(startLocation) || JdbcUtil.NULL_STRING.equalsIgnoreCase(startLocation)) { return null; } diff --git a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java index baa792a221..15eb2bf685 100644 --- a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java @@ -32,7 +32,7 @@ import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.postgresql.PGConnection; import org.postgresql.jdbc.PgConnection; import org.slf4j.Logger; diff --git a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java index 42a87a8eb8..7534e2b03f 100644 --- a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.HashSet; import java.util.List; diff --git a/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java index 179513fcac..31a5752e1a 100644 --- a/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java @@ -28,7 +28,7 @@ import io.lettuce.core.cluster.RedisClusterClient; import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.internal.HostAndPort; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/source/RocketMQSourceFunction.java b/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/source/RocketMQSourceFunction.java index 1339d80005..53ca31a6d8 100644 --- a/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/source/RocketMQSourceFunction.java +++ b/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/source/RocketMQSourceFunction.java @@ -46,7 +46,7 @@ import org.apache.flink.shaded.curator4.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.commons.collections.map.LinkedMap; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer; import org.apache.rocketmq.client.consumer.PullResult; import org.apache.rocketmq.client.exception.MQClientException; diff --git a/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/utils/RocketMQUtils.java b/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/utils/RocketMQUtils.java index 415b085e83..7f619dafdd 100644 --- a/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/utils/RocketMQUtils.java +++ b/chunjun-connectors/chunjun-connector-rocketmq/src/main/java/com/dtstack/chunjun/connector/rocketmq/utils/RocketMQUtils.java @@ -19,8 +19,8 @@ import com.dtstack.chunjun.connector.rocketmq.conf.RocketMQConf; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; import org.apache.rocketmq.client.AccessChannel; diff --git a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/converter/S3ColumnConverter.java b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/converter/S3ColumnConverter.java index f20ce4c88d..f74c49be9b 100644 --- a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/converter/S3ColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/converter/S3ColumnConverter.java @@ -34,7 +34,7 @@ import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.sql.Date; import java.sql.Time; diff --git a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/sink/S3OutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/sink/S3OutputFormatBuilder.java index 68ce055afd..e966722a7a 100644 --- a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/sink/S3OutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/sink/S3OutputFormatBuilder.java @@ -22,7 +22,7 @@ import com.dtstack.chunjun.connector.s3.conf.S3Conf; import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The builder of FtpOutputFormat diff --git a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormat.java b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormat.java index f9eca3a32c..f90f334ed3 100644 --- a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormat.java +++ b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormat.java @@ -36,7 +36,7 @@ import com.amazonaws.services.s3.model.GetObjectRequest; import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectInputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormatBuilder.java b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormatBuilder.java index 6949b52825..fd0dfee57e 100644 --- a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/source/S3InputFormatBuilder.java @@ -24,7 +24,7 @@ import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * build S3InputFormat{@link S3InputFormat} and check S3Config{@link S3Conf} diff --git a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/util/S3Util.java b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/util/S3Util.java index 3097edd0cd..0c114d157d 100644 --- a/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/util/S3Util.java +++ b/chunjun-connectors/chunjun-connector-s3/src/main/java/com/dtstack/chunjun/connector/s3/util/S3Util.java @@ -44,7 +44,7 @@ import com.amazonaws.services.s3.model.S3ObjectSummary; import com.amazonaws.services.s3.model.UploadPartRequest; import com.amazonaws.services.s3.model.UploadPartResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java index 0bc9be0826..023e688910 100644 --- a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java @@ -29,7 +29,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java index c350105627..ca043fa201 100644 --- a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java @@ -33,7 +33,7 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.string.StringDecoder; import io.netty.handler.codec.string.StringEncoder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java index 9740ce3ba9..fb2cb54a70 100644 --- a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java @@ -30,7 +30,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 java.util.concurrent.SynchronousQueue; @@ -50,8 +50,7 @@ public class SocketInputFormat extends BaseRichInputFormat { public void setSocketConfig(SocketConfig socketConfig) { String[] hostPort = - org.apache.commons.lang.StringUtils.split( - socketConfig.getAddress(), ConstantValue.COLON_SYMBOL); + StringUtils.split(socketConfig.getAddress(), ConstantValue.COLON_SYMBOL); socketConfig.setHost(hostPort[0]); socketConfig.setPort(Integer.parseInt(hostPort[1])); this.socketConfig = socketConfig; diff --git a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java index 1ac0654b42..c7913e0bea 100644 --- a/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java @@ -55,8 +55,7 @@ protected void checkFormat() { sb.append("config error:[address] cannot be blank \n"); } String[] hostPort = - org.apache.commons.lang.StringUtils.split( - socketConfig.getAddress(), ConstantValue.COLON_SYMBOL); + StringUtils.split(socketConfig.getAddress(), ConstantValue.COLON_SYMBOL); if (hostPort.length != ADDRESS_SPLITS) { sb.append("please check your host format \n"); } diff --git a/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java index 16f7c03634..45332d6c6d 100644 --- a/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java @@ -34,7 +34,7 @@ import org.apache.flink.table.data.RowData; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.sql.Connection; import java.util.concurrent.BlockingQueue; diff --git a/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java index 56e997fd18..f975b16b00 100644 --- a/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java @@ -33,7 +33,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.sql.Connection; import java.sql.SQLException; diff --git a/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/connection/StarRocksJdbcConnectionProvider.java b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/connection/StarRocksJdbcConnectionProvider.java index 2ee2021256..b52fd443f0 100644 --- a/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/connection/StarRocksJdbcConnectionProvider.java +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/connection/StarRocksJdbcConnectionProvider.java @@ -21,6 +21,7 @@ import com.dtstack.chunjun.util.ClassUtil; import com.dtstack.chunjun.util.RetryUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,12 +59,10 @@ public Connection getConnection() throws ClassNotFoundException { Class.forName(jdbcOptions.getDriverName()); } Properties prop = new Properties(); - if (org.apache.commons.lang3.StringUtils.isNotBlank( - jdbcOptions.getUsername().orElse(null))) { + if (StringUtils.isNotBlank(jdbcOptions.getUsername().orElse(null))) { prop.put("user", jdbcOptions.getUsername().get()); } - if (org.apache.commons.lang3.StringUtils.isNotBlank( - jdbcOptions.getPassword().orElse(null))) { + if (StringUtils.isNotBlank(jdbcOptions.getPassword().orElse(null))) { prop.put("password", jdbcOptions.getPassword().get()); } synchronized (ClassUtil.LOCK_STR) { diff --git a/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java index 102a03842c..a23b73a30a 100644 --- a/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java @@ -27,7 +27,7 @@ import com.github.jsonzou.jmockdata.JMockData; import com.github.jsonzou.jmockdata.MockConfig; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import java.io.ByteArrayInputStream; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java index ef3f8bd6fd..421db5a8e5 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java @@ -21,7 +21,7 @@ import com.dtstack.chunjun.util.GsonUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; import java.util.ArrayList; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java index 97cb1bdb32..aa2cb1c834 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java @@ -21,7 +21,7 @@ import com.dtstack.chunjun.throwable.CastException; import com.dtstack.chunjun.util.DateUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import java.math.BigDecimal; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java b/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java index f3f1a863d8..b3706170f2 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java @@ -23,7 +23,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.FileInputStream; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java b/chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java index 359967a650..831533a430 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java @@ -28,7 +28,7 @@ import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.yarn.configuration.YarnConfigOptions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java index 1e19da700f..64c785be1a 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java @@ -28,7 +28,7 @@ import org.apache.flink.api.common.cache.DistributedCache; 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.apache.hadoop.security.authentication.util.KerberosName; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java index 68ec80e4ca..4cb63e1afd 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java @@ -8,7 +8,7 @@ import org.apache.flink.api.common.cache.DistributedCache; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java index b8c1674224..d881ec78aa 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java @@ -25,7 +25,7 @@ import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpException; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java b/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java index 7ff3764126..5003586cd3 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/typeutil/serializer/base/StringColumnSerializer.java @@ -30,7 +30,7 @@ import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.IOException; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java index 03d74658ec..77c844eb4f 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.cache.DistributedCache; 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.fs.FileSystem; import org.apache.hadoop.mapred.JobConf; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java index 88b293616f..d0dc764076 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java @@ -23,7 +23,7 @@ import com.dtstack.chunjun.constants.ConfigConstant; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java index c21c6f49e0..97256c5bbd 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.JobExecutionResult; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java index 9c6b2a6656..2df8357b10 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java @@ -20,7 +20,7 @@ import com.dtstack.chunjun.throwable.ChunJunRuntimeException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.telnet.TelnetClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java index 782d548cc3..55e00ee51b 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java @@ -1,6 +1,6 @@ package com.dtstack.chunjun.util; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; diff --git a/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/oracle/sync/OracleSyncE2eITCase.java b/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/oracle/sync/OracleSyncE2eITCase.java index d13833c704..7fa88ef7cd 100644 --- a/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/oracle/sync/OracleSyncE2eITCase.java +++ b/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/oracle/sync/OracleSyncE2eITCase.java @@ -23,6 +23,7 @@ import com.dtstack.chunjun.connector.test.utils.JdbcProxy; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -30,7 +31,6 @@ import org.testcontainers.containers.OracleContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.lifecycle.Startables; -import org.testcontainers.shaded.org.apache.commons.lang.StringUtils; import java.io.File; import java.io.IOException; diff --git a/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/postgre/sync/PostgreSyncE2eITCase.java b/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/postgre/sync/PostgreSyncE2eITCase.java index c83b531c73..8f96404f89 100644 --- a/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/postgre/sync/PostgreSyncE2eITCase.java +++ b/chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/test/standalone/postgre/sync/PostgreSyncE2eITCase.java @@ -24,13 +24,13 @@ import com.dtstack.chunjun.connector.test.utils.JdbcProxy; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.lifecycle.Startables; -import org.testcontainers.shaded.org.apache.commons.lang.StringUtils; import java.io.File; import java.io.IOException; diff --git a/chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java b/chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java index 799c3f174f..ae071a11ab 100644 --- a/chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java +++ b/chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java @@ -20,7 +20,7 @@ import com.dtstack.chunjun.Main; import com.dtstack.chunjun.util.GsonUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java index c7b0e8f022..47a0a7c86b 100644 --- a/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java +++ b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java @@ -23,6 +23,7 @@ import com.dtstack.chunjun.util.TelnetUtil; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,10 +62,10 @@ public static Connection getConnection(JdbcMetricConf jdbcConf, JdbcDialect jdbc prop.setProperty(entry.getKey(), entry.getValue()); } } - if (org.apache.commons.lang3.StringUtils.isNotBlank(jdbcConf.getUsername())) { + if (StringUtils.isNotBlank(jdbcConf.getUsername())) { prop.put("user", jdbcConf.getUsername()); } - if (org.apache.commons.lang3.StringUtils.isNotBlank(jdbcConf.getPassword())) { + if (StringUtils.isNotBlank(jdbcConf.getPassword())) { prop.put("password", jdbcConf.getPassword()); } Properties finalProp = prop;