解决elasticsearch-side分支与test_1.8_3.1.0x的冲突2

Author: dengdejiushini

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

@@ -63,7 +63,6 @@
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -893,9 +892,9 @@ private TypeInformation<Row> projectedTypeInfo(int[] fields, TableSchema schema)
     private boolean checkFieldsInfo(CreateTmpTableParser.SqlParserResult result, Table table) {
         List<String> fieldNames = new LinkedList<>();
         String fieldsInfo = result.getFieldsInfoStr();
-        String[] fields = StringUtils.split(fieldsInfo, ",");
+        String[] fields = fieldsInfo.split(",");
         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));
             }

redis5/redis5-sink/src/main/java/com/dtstack/flink/sql/sink/redis/table/RedisSinkParser.java

@@ -24,6 +24,7 @@
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;