From 6d9a8095ebd489b1f6f39a2a3f5aaec8f6f73574 Mon Sep 17 00:00:00 2001
From: mainmain <57514971+mainmainer@users.noreply.github.com>
Date: Mon, 20 Nov 2023 20:42:23 +0800
Subject: [PATCH] [improvement](chat) adapt checkstyle. (#410)

---
 .../jsqlparser/SqlParserRemoveHelper.java     | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java
index 5b4f4ca7e..c0f5946b2 100644
--- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java
+++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java
@@ -27,8 +27,6 @@ import net.sf.jsqlparser.statement.select.SelectBody;
 import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import net.sf.jsqlparser.statement.select.SelectItem;
 import net.sf.jsqlparser.statement.select.SelectVisitorAdapter;
-import net.sf.jsqlparser.statement.select.SelectItem;
-import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -64,6 +62,27 @@ public class SqlParserRemoveHelper {
         return selectStatement.toString();
     }
 
+    public static String removeSelect(String sql, Set<String> fields) {
+        Select selectStatement = SqlParserSelectHelper.getSelect(sql);
+        if (selectStatement == null) {
+            return sql;
+        }
+        SelectBody selectBody = selectStatement.getSelectBody();
+        if (!(selectBody instanceof PlainSelect)) {
+            return sql;
+        }
+        List<SelectItem> selectItems = ((PlainSelect) selectBody).getSelectItems();
+        selectItems.removeIf(selectItem -> {
+            if (selectItem instanceof SelectExpressionItem) {
+                SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
+                String columnName = SqlParserSelectHelper.getColumnName(selectExpressionItem.getExpression());
+                return fields.contains(columnName);
+            }
+            return false;
+        });
+        return selectStatement.toString();
+    }
+
     public static String removeWhereCondition(String sql, Set<String> removeFieldNames) {
         Select selectStatement = SqlParserSelectHelper.getSelect(sql);
         SelectBody selectBody = selectStatement.getSelectBody();
@@ -226,28 +245,6 @@ public class SqlParserRemoveHelper {
         return selectStatement.toString();
     }
 
-
-    public static String removeSelect(String sql, Set<String> fields) {
-        Select selectStatement = SqlParserSelectHelper.getSelect(sql);
-        if (selectStatement == null) {
-            return sql;
-        }
-        SelectBody selectBody = selectStatement.getSelectBody();
-        if (!(selectBody instanceof PlainSelect)) {
-            return sql;
-        }
-        List<SelectItem> selectItems = ((PlainSelect) selectBody).getSelectItems();
-        selectItems.removeIf(selectItem -> {
-            if (selectItem instanceof SelectExpressionItem) {
-                SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
-                String columnName = SqlParserSelectHelper.getColumnName(selectExpressionItem.getExpression());
-                return fields.contains(columnName);
-            }
-            return false;
-        });
-        return selectStatement.toString();
-    }
-
     public static String removeGroupBy(String sql, Set<String> fields) {
         Select selectStatement = SqlParserSelectHelper.getSelect(sql);
         if (selectStatement == null) {