Merge branch 'hotfix_1.8_3.10.2_21725_megreDev' into 'v1.8.0_dev'

修正错误的用StringUtils.splits()替换String.splits()



See merge request !235

Author: zoudaokoulife

core/src/main/java/com/dtstack/flink/sql/parser/CreateTableParser.java

@@ -22,7 +22,6 @@
 
 import com.dtstack.flink.sql.util.DtStringUtil;
 import com.google.common.collect.Maps;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -70,7 +69,7 @@ public void parseSql(String sql, SqlTree sqlTree) {
     }
 
     private Map parseProp(String propsStr){
-        String[] strs = StringUtils.split(propsStr.trim(), "'\\s*,");
+        String[] strs = propsStr.trim().split("'\\s*,");
         Map<String, Object> propMap = Maps.newHashMap();
         for(int i=0; i<strs.length; i++){
             List<String> ss = DtStringUtil.splitIgnoreQuota(strs[i], '=');

core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java

@@ -895,7 +895,7 @@ private boolean checkFieldsInfo(CreateTmpTableParser.SqlParserResult result, Tab
         String fieldsInfo = result.getFieldsInfoStr();
         String[] fields = StringUtils.split(fieldsInfo, ",");
         for (int i = 0; i < fields.length; i++) {
-            String[] filed = StringUtils.split(fields[i], "\\s");
+            String[] filed = fields[i].split("\\s");
             if (filed.length < 2 || fields.length != table.getSchema().getColumnNames().length){
                 return false;
             } else {

core/src/main/java/com/dtstack/flink/sql/table/AbsTableParser.java

@@ -92,7 +92,7 @@ public void parseFieldsInfo(String fieldsInfo, TableInfo tableInfo){
                 throw new RuntimeException(String.format("table [%s],exists field empty.", tableInfo.getName()));
             }
 
-            String[] filedInfoArr = StringUtils.split(fieldRow, "\\s+");
+            String[] filedInfoArr = fieldRow.split("\\s+");
             if(filedInfoArr.length < 2 ){
                 throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), fieldRow));
             }

core/src/main/java/com/dtstack/flink/sql/util/DtStringUtil.java

@@ -180,7 +180,7 @@ public static String addJdbcParam(String dbUrl, Map<String, String> addParams, b
             return dbUrl;
         }
 
-        String[] splits = StringUtils.split(dbUrl, "\\?");
+        String[] splits = dbUrl.split("\\?");
         String preStr = splits[0];
         Map<String, String> params = Maps.newHashMap();
         if(splits.length > 1){

elasticsearch5/elasticsearch5-sink/src/main/java/com/dtstack/flink/sql/sink/elasticsearch/EsUtil.java

@@ -22,7 +22,6 @@
 import org.apache.flink.util.Preconditions;
 
 import com.dtstack.flink.sql.util.DtStringUtil;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -42,7 +41,7 @@ public static Map<String, Object> rowToJsonMap(Row row, List<String> fields, Lis
         int i = 0;
         for(; i < fields.size(); ++i) {
             String field = fields.get(i);
-            String[] parts = StringUtils.split(field, "\\.");
+            String[] parts = field.split("\\.");
             Map<String, Object> currMap = jsonMap;
             for(int j = 0; j < parts.length - 1; ++j) {
                 String key = parts[j];

hbase/hbase-side/hbase-side-core/src/main/java/com/dtstack/flink/sql/side/hbase/RowKeyBuilder.java

@@ -22,7 +22,6 @@
 
 import com.dtstack.flink.sql.side.hbase.enums.EReplaceType;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -59,7 +58,7 @@ public void init(String rowKeyTempl){
                 fieldCols = infoAlias;
             }
 
-            String[] fieldArr = StringUtils.split(fieldCols, "\\+");
+            String[] fieldArr = fieldCols.split("\\+");
             List<ReplaceInfo> fieldList = Lists.newArrayList();
             for(String oneField : fieldArr){
                 ReplaceInfo replaceInfo =  getReplaceInfo(oneField);
@@ -109,7 +108,7 @@ private String buildStr(List<ReplaceInfo> fieldList, Map<String, Object> refData
 
     public static String[] splitIgnoreQuotaBrackets(String str, String delimiter){
         String splitPatternStr = delimiter + "(?![^()]*+\\))(?![^{}]*+})(?![^\\[\\]]*+\\])";
-        return StringUtils.split(str, splitPatternStr);
+        return str.split(splitPatternStr);
     }
 
     /**

hbase/hbase-side/hbase-side-core/src/main/java/com/dtstack/flink/sql/side/hbase/table/HbaseSideParser.java

@@ -23,7 +23,6 @@
 import com.dtstack.flink.sql.table.AbsSideTableParser;
 import com.dtstack.flink.sql.table.TableInfo;
 import com.dtstack.flink.sql.util.MathUtil;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -84,7 +83,7 @@ private void dealField(Matcher matcher, TableInfo tableInfo){
         String filedDefineStr = matcher.group(1);
         String aliasStr = matcher.group(2);
 
-        String[] filedInfoArr = StringUtils.split(filedDefineStr, "\\s+");
+        String[] filedInfoArr = filedDefineStr.split("\\s+");
         if(filedInfoArr.length < 2){
             throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), matcher.group(0)));
         }

hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/table/HbaseSinkParser.java

@@ -81,7 +81,7 @@ public void parseFieldsInfo(String fieldsInfo, HbaseTableInfo tableInfo){
         for(String fieldRow : fieldRows){
             fieldRow = fieldRow.trim();
 
-            String[] filedInfoArr = StringUtils.split(fieldRow, "\\s+");
+            String[] filedInfoArr = fieldRow.split("\\s+");
             if(filedInfoArr.length < 2 ){
                 throw new RuntimeException(String.format("table [%s] field [%s] format error.", tableInfo.getName(), fieldRow));
             }