[hotfix-36382][core][es7] org.apache.commons.compress.utils.Lists 和 engine中类冲突导致。

Author: simenliuxing

elasticsearch7/elasticsearch7-side/elasticsearch7-all-side/src/main/java/com/dtstack/flink/sql/side/elasticsearch7/Elasticsearch7AllSideInfo.java

@@ -26,9 +26,9 @@
 import com.dtstack.flink.sql.util.ParseUtils;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.compress.utils.Lists;
 import org.apache.flink.api.java.typeutils.RowTypeInfo;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,7 +53,7 @@ public void parseSelectFields(JoinInfo joinInfo) {
 
         String sideTableName = joinInfo.getSideTableName();
         String nonSideTableName = joinInfo.getNonSideTable();
-        List<String> fields = Lists.newArrayList();
+        List<String> fields = new ArrayList<>();
 
         int sideIndex = 0;
         for (int i = 0; i< outFieldInfoList.size(); i++) {
@@ -77,7 +77,7 @@ public void parseSelectFields(JoinInfo joinInfo) {
 
         SqlNode conditionNode = joinInfo.getCondition();
 
-        List<SqlNode> sqlNodeList = Lists.newArrayList();
+        List<SqlNode> sqlNodeList = new ArrayList<>();
 
         ParseUtils.parseAnd(conditionNode, sqlNodeList);
 

elasticsearch7/elasticsearch7-side/elasticsearch7-async-side/src/main/java/com/dtstack/flink/sql/side/elasticsearch7/Elasticsearch7AsyncReqRow.java

@@ -27,7 +27,6 @@
 import com.dtstack.flink.sql.util.ParseUtils;
 import com.dtstack.flink.sql.util.RowDataComplete;
 import org.apache.calcite.sql.SqlNode;
-import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.java.typeutils.RowTypeInfo;
 import org.apache.flink.configuration.Configuration;
@@ -50,6 +49,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -64,7 +64,7 @@ public class Elasticsearch7AsyncReqRow extends BaseAsyncReqRow implements Serial
     private static final Logger LOG = LoggerFactory.getLogger(Elasticsearch7AsyncReqRow.class);
     private transient RestHighLevelClient rhlClient;
     private SearchRequest searchRequest;
-    private List<String> sqlJoinCompareOperate = Lists.newArrayList();
+    private List<String> sqlJoinCompareOperate = new ArrayList<>();
 
     public Elasticsearch7AsyncReqRow(RowTypeInfo rowTypeInfo, JoinInfo joinInfo, List<FieldInfo> outFieldInfoList, AbstractSideTableInfo sideTableInfo) {
         super(new Elasticsearch7AsyncSideInfo(rowTypeInfo, joinInfo, outFieldInfoList, sideTableInfo));
@@ -97,8 +97,8 @@ public void handleAsyncInvoke(Map<String, Object> inputParams, BaseRow input, Re
             @Override
             public void onResponse(SearchResponse searchResponse) {
 
-                List<Object> cacheContent = Lists.newArrayList();
-                List<BaseRow> rowList = Lists.newArrayList();
+                List<Object> cacheContent = new ArrayList<>();
+                List<BaseRow> rowList = new ArrayList<>();
                 SearchHit[] searchHits = searchResponse.getHits().getHits();
                 if (searchHits.length > 0) {
                     Elasticsearch7SideTableInfo tableInfo = null;