Added dlink-executor module code style. (#919)

dlink-executor/src/main/java/com/dlink/catalog/function/FunctionManager.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.catalog.function;
 
 import com.dlink.constant.FlinkFunctionConstant;

dlink-executor/src/main/java/com/dlink/catalog/function/UDFunction.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.catalog.function;
 
 import org.apache.flink.table.functions.FunctionDefinition;

dlink-executor/src/main/java/com/dlink/constant/FlinkConstant.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.constant;
 
 /**

dlink-executor/src/main/java/com/dlink/constant/FlinkFunctionConstant.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.constant;
 
 public interface FlinkFunctionConstant {

dlink-executor/src/main/java/com/dlink/constant/FlinkSQLConstant.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.constant;
 
 /**

dlink-executor/src/main/java/com/dlink/exception/FlinkException.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.exception;
 
 /**

dlink-executor/src/main/java/com/dlink/executor/AppBatchExecutor.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.executor;
 
 import com.dlink.assertion.Asserts;
+
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 

dlink-executor/src/main/java/com/dlink/executor/AppStreamExecutor.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.executor;
 
 import com.dlink.assertion.Asserts;
+
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 

dlink-executor/src/main/java/com/dlink/executor/EnvironmentSetting.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.executor;
 
 import com.dlink.assertion.Asserts;
 import com.dlink.constant.FlinkConstant;
 import com.dlink.constant.NetConstant;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-executor/src/main/java/com/dlink/executor/Executor.java

@@ -17,16 +17,13 @@
  *
  */
 
-
 package com.dlink.executor;
 
 import com.dlink.assertion.Asserts;
 import com.dlink.interceptor.FlinkInterceptor;
 import com.dlink.interceptor.FlinkInterceptorResult;
 import com.dlink.result.SqlExplainResult;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.JobExecutionResult;
 import org.apache.flink.configuration.Configuration;
@@ -48,6 +45,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * Executor
  *

dlink-executor/src/main/java/com/dlink/executor/ExecutorSetting.java

@@ -17,20 +17,21 @@
  *
  */
 
-
 package com.dlink.executor;
 
 import com.dlink.assertion.Asserts;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * ExecutorSetting
  *
@@ -107,7 +108,8 @@ public class ExecutorSetting {
         this.config = config;
     }
 
-    public static ExecutorSetting build(Integer checkpoint, Integer parallelism, boolean useSqlFragment, boolean useStatementSet, boolean useBatchModel, String savePointPath, String jobName, String configJson) {
+    public static ExecutorSetting build(Integer checkpoint, Integer parallelism, boolean useSqlFragment, boolean useStatementSet,
+                                        boolean useBatchModel, String savePointPath, String jobName, String configJson) {
         List<Map<String, String>> configList = new ArrayList<>();
         if (Asserts.isNotNullString(configJson)) {
             try {
@@ -144,14 +146,14 @@ public class ExecutorSetting {
 
     @Override
     public String toString() {
-        return "ExecutorSetting{" +
-                "checkpoint=" + checkpoint +
-                ", parallelism=" + parallelism +
-                ", useSqlFragment=" + useSqlFragment +
-                ", useStatementSet=" + useStatementSet +
-                ", savePointPath='" + savePointPath + '\'' +
-                ", jobName='" + jobName + '\'' +
-                ", config=" + config +
-                '}';
+        return "ExecutorSetting{"
+                + "checkpoint=" + checkpoint
+                + ", parallelism=" + parallelism
+                + ", useSqlFragment=" + useSqlFragment
+                + ", useStatementSet=" + useStatementSet
+                + ", savePointPath='" + savePointPath + '\''
+                + ", jobName='" + jobName + '\''
+                + ", config=" + config
+                + '}';
     }
 }

dlink-executor/src/main/java/com/dlink/executor/LocalBatchExecutor.java

@@ -17,15 +17,13 @@
  *
  */
 
-
 package com.dlink.executor;
 
+import com.dlink.assertion.Asserts;
+
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-import com.dlink.assertion.Asserts;
-
 /**
  * LocalBatchExecutor
  *

dlink-executor/src/main/java/com/dlink/executor/LocalStreamExecutor.java

@@ -17,15 +17,13 @@
  *
  */
 
-
 package com.dlink.executor;
 
+import com.dlink.assertion.Asserts;
+
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-import com.dlink.assertion.Asserts;
-
 /**
  * LocalStreamExecuter
  *

dlink-executor/src/main/java/com/dlink/executor/RemoteBatchExecutor.java

@@ -17,15 +17,13 @@
  *
  */
 
-
 package com.dlink.executor;
 
+import com.dlink.assertion.Asserts;
+
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-import com.dlink.assertion.Asserts;
-
 /**
  * RemoteBatchExecutor
  *

dlink-executor/src/main/java/com/dlink/executor/RemoteStreamExecutor.java

@@ -17,15 +17,13 @@
  *
  */
 
-
 package com.dlink.executor;
 
+import com.dlink.assertion.Asserts;
+
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.DeploymentOptions;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-import com.dlink.assertion.Asserts;
-
 /**
  * RemoteStreamExecutor
  *

dlink-executor/src/main/java/com/dlink/executor/SqlManager.java

@@ -17,13 +17,17 @@
  *
  */
 
-
 package com.dlink.executor;
 
-import static java.lang.String.format;
 import static org.apache.flink.util.Preconditions.checkArgument;
 import static org.apache.flink.util.Preconditions.checkNotNull;
 
+import static java.lang.String.format;
+
+import com.dlink.assertion.Asserts;
+import com.dlink.constant.FlinkSQLConstant;
+import com.dlink.model.SystemConfiguration;
+
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.ExpressionParserException;
 import org.apache.flink.table.api.Table;
@@ -41,10 +45,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.dlink.assertion.Asserts;
-import com.dlink.constant.FlinkSQLConstant;
-import com.dlink.model.SystemConfiguration;
-
 /**
  * Flink Sql Fragment Manager
  *

dlink-executor/src/main/java/com/dlink/interceptor/FlinkInterceptor.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.interceptor;
 
 import com.dlink.assertion.Asserts;
@@ -25,6 +24,7 @@ import com.dlink.executor.Executor;
 import com.dlink.trans.Operation;
 import com.dlink.trans.Operations;
 import com.dlink.utils.SqlUtil;
+
 import org.apache.flink.table.api.TableResult;
 
 /**

dlink-executor/src/main/java/com/dlink/interceptor/FlinkInterceptorResult.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.interceptor;
 
 import org.apache.flink.table.api.TableResult;

dlink-executor/src/main/java/com/dlink/parser/BaseSingleSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 import com.dlink.assertion.Asserts;
@@ -41,7 +40,6 @@ public abstract class BaseSingleSqlParser {
     //Sql语句片段
     protected List<SqlSegment> segments;
 
-
     /**
      * 构造函数，传入原始Sql语句，进行劈分。
      **/
@@ -64,7 +62,6 @@ public abstract class BaseSingleSqlParser {
         for (SqlSegment sqlSegment : segments) {
             sqlSegment.parse(originalSql);
             if (Asserts.isNotNullString(sqlSegment.getStart())) {
-//                map.put(sqlSegment.getStart().toUpperCase(), sqlSegment.getBodyPieces());
                 map.put(sqlSegment.getType().toUpperCase(), sqlSegment.getBodyPieces());
             }
         }

dlink-executor/src/main/java/com/dlink/parser/CreateAggTableSelectSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/CreateCDCSourceSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/DeleteSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/InsertSelectSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/InsertSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/SelectSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/SetSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/ShowFragmentParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/SingleSqlParserFactory.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 import java.util.List;
@@ -35,7 +34,7 @@ public class SingleSqlParserFactory {
 
     public static Map<String, List<String>> generateParser(String sql) {
         BaseSingleSqlParser tmp = null;
-//        sql = sql.replace("\n"," ").replaceAll("\\s{1,}", " ") +" ENDOFSQL";
+        //sql = sql.replace("\n"," ").replaceAll("\\s{1,}", " ") +" ENDOFSQL";
         sql = sql.replace("\r\n", " ").replace("\n", " ") + " ENDOFSQL";
         if (contains(sql, "(insert\\s+into)(.+)(select)(.+)(from)(.+)")) {
             tmp = new InsertSelectSqlParser(sql);
@@ -59,7 +58,6 @@ public class SingleSqlParserFactory {
             tmp = new SetSqlParser(sql);
         } else if (contains(sql, "(show\\s+fragment)\\s+(.+)")) {
             tmp = new ShowFragmentParser(sql);
-        } else {
         }
         return tmp.splitSql2Segment();
     }

dlink-executor/src/main/java/com/dlink/parser/SqlSegment.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 import com.dlink.assertion.Asserts;

dlink-executor/src/main/java/com/dlink/parser/SqlType.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/parser/UpdateSqlParser.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.parser;
 
 /**

dlink-executor/src/main/java/com/dlink/trans/AbstractOperation.java

@@ -17,16 +17,16 @@
  *
  */
 
-
 package com.dlink.trans;
 
 import com.dlink.executor.CustomTableEnvironmentImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * AbstractOperation
  *

dlink-executor/src/main/java/com/dlink/trans/CreateOperation.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.trans;
 
 /**

dlink-executor/src/main/java/com/dlink/trans/Operation.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.trans;
 
 import com.dlink.executor.Executor;
+
 import org.apache.flink.table.api.TableResult;
 
 /**

dlink-executor/src/main/java/com/dlink/trans/Operations.java

@@ -17,11 +17,14 @@
  *
  */
 
-
 package com.dlink.trans;
 
 import com.dlink.parser.SqlType;
-import com.dlink.trans.ddl.*;
+import com.dlink.trans.ddl.CreateAggTableOperation;
+import com.dlink.trans.ddl.CreateCDCSourceOperation;
+import com.dlink.trans.ddl.SetOperation;
+import com.dlink.trans.ddl.ShowFragmentOperation;
+import com.dlink.trans.ddl.ShowFragmentsOperation;
 
 /**
  * Operations
@@ -32,7 +35,7 @@ import com.dlink.trans.ddl.*;
 public class Operations {
 
     private static Operation[] operations = {
-            new CreateAggTableOperation()
+        new CreateAggTableOperation()
             , new SetOperation()
             , new CreateCDCSourceOperation()
             , new ShowFragmentsOperation()

dlink-executor/src/main/java/com/dlink/trans/ddl/AggTable.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
 import com.dlink.parser.SingleSqlParserFactory;
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;

dlink-executor/src/main/java/com/dlink/trans/ddl/CDCSource.java

@@ -17,18 +17,17 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
+import com.dlink.assertion.Asserts;
+import com.dlink.parser.SingleSqlParserFactory;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.dlink.assertion.Asserts;
-import com.dlink.parser.SingleSqlParserFactory;
-
 /**
  * CDCSource
  *

dlink-executor/src/main/java/com/dlink/trans/ddl/CreateAggTableOperation.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
 import com.dlink.executor.Executor;
 import com.dlink.trans.AbstractOperation;
 import com.dlink.trans.Operation;
+
 import org.apache.flink.table.api.Table;
 import org.apache.flink.table.api.TableResult;
 
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class CreateAggTableOperation extends AbstractOperation implements Operation {
 
-    private String KEY_WORD = "CREATE AGGTABLE";
+    private static final String KEY_WORD = "CREATE AGGTABLE";
 
     public CreateAggTableOperation() {
     }

dlink-executor/src/main/java/com/dlink/trans/ddl/CreateCDCSourceOperation.java

@@ -17,17 +17,8 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
-import org.apache.flink.streaming.api.datastream.DataStreamSource;
-import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
-import org.apache.flink.table.api.TableResult;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import com.dlink.assertion.Asserts;
 import com.dlink.cdc.CDCBuilder;
 import com.dlink.cdc.CDCBuilderFactory;
@@ -41,6 +32,14 @@ import com.dlink.model.Table;
 import com.dlink.trans.AbstractOperation;
 import com.dlink.trans.Operation;
 
+import org.apache.flink.streaming.api.datastream.DataStreamSource;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.table.api.TableResult;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * CreateCDCSourceOperation
  *
@@ -49,7 +48,7 @@ import com.dlink.trans.Operation;
  */
 public class CreateCDCSourceOperation extends AbstractOperation implements Operation {
 
-    private String KEY_WORD = "EXECUTE CDCSOURCE";
+    private static final String KEY_WORD = "EXECUTE CDCSOURCE";
 
     public CreateCDCSourceOperation() {
     }

dlink-executor/src/main/java/com/dlink/trans/ddl/SetOperation.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
 import com.dlink.assertion.Asserts;
@@ -25,6 +24,7 @@ import com.dlink.executor.Executor;
 import com.dlink.parser.SingleSqlParserFactory;
 import com.dlink.trans.AbstractOperation;
 import com.dlink.trans.Operation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.table.api.TableResult;
@@ -41,7 +41,7 @@ import java.util.Map;
  **/
 public class SetOperation extends AbstractOperation implements Operation {
 
-    private String KEY_WORD = "SET";
+    private static final String KEY_WORD = "SET";
 
     public SetOperation() {
     }

dlink-executor/src/main/java/com/dlink/trans/ddl/ShowFragmentOperation.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
 import com.dlink.assertion.Asserts;
@@ -25,6 +24,7 @@ import com.dlink.executor.Executor;
 import com.dlink.parser.SingleSqlParserFactory;
 import com.dlink.trans.AbstractOperation;
 import com.dlink.trans.Operation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.table.api.TableResult;
 
@@ -38,7 +38,7 @@ import java.util.Map;
  * @since 2022/2/17 17:08
  **/
 public class ShowFragmentOperation extends AbstractOperation implements Operation {
-    private String KEY_WORD = "SHOW FRAGMENT ";
+    private static final String KEY_WORD = "SHOW FRAGMENT ";
 
     public ShowFragmentOperation() {
     }

dlink-executor/src/main/java/com/dlink/trans/ddl/ShowFragmentsOperation.java

@@ -17,12 +17,12 @@
  *
  */
 
-
 package com.dlink.trans.ddl;
 
 import com.dlink.executor.Executor;
 import com.dlink.trans.AbstractOperation;
 import com.dlink.trans.Operation;
+
 import org.apache.flink.table.api.TableResult;
 
 /**
@@ -33,7 +33,7 @@ import org.apache.flink.table.api.TableResult;
  **/
 public class ShowFragmentsOperation extends AbstractOperation implements Operation {
 
-    private String KEY_WORD = "SHOW FRAGMENTS";
+    private static final String KEY_WORD = "SHOW FRAGMENTS";
 
     public ShowFragmentsOperation() {
     }

dlink-executor/src/test/java/com.dlink.executor/FlinkInterceptorTest.java

@@ -17,11 +17,11 @@
  *
  */
 
-
 package com.dlink.core;
 
 import com.dlink.executor.Executor;
 import com.dlink.interceptor.FlinkInterceptor;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -34,10 +34,10 @@ import org.junit.Test;
 public class FlinkInterceptorTest {
 
     @Test
-    public void replaceFragmentTest(){
-        String statement = "nullif1:=NULLIF(1, 0) as val;" +
-            "nullif2:=NULLIF(0, 0) as val$null;" +
-            "select ${nullif1},${nullif2}";
+    public void replaceFragmentTest() {
+        String statement = "nullif1:=NULLIF(1, 0) as val;"
+            + "nullif2:=NULLIF(0, 0) as val$null;"
+            + "select ${nullif1},${nullif2}";
         String pretreatStatement = FlinkInterceptor.pretreatStatement(Executor.build(), statement);
         Assert.assertEquals("select NULLIF(1, 0) as val,NULLIF(0, 0) as val$null",pretreatStatement);
     }