Added dlink-function and dlink-gateway module code style (#920)

dlink-function/src/main/java/com/dlink/ud/udf/GetKey.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.ud.udf;
 
 import org.apache.flink.table.functions.ScalarFunction;

dlink-function/src/main/java/com/dlink/ud/udtaf/RowsToMap.java

@@ -17,10 +17,8 @@
  *
  */
 
-
 package com.dlink.ud.udtaf;
 
-
 import org.apache.flink.table.functions.TableAggregateFunction;
 import org.apache.flink.util.Collector;
 
@@ -40,7 +38,6 @@ public class RowsToMap extends TableAggregateFunction<String, Map> {
         return new HashMap();
     }
 
-
     public void accumulate(Map acc, String cls, Object v, String key) {
         String[] keys = key.split(",");
         for (int i = 0; i < keys.length; i++) {

dlink-function/src/main/java/com/dlink/ud/udtaf/Top2.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.ud.udtaf;
 
 import org.apache.flink.api.java.tuple.Tuple2;

dlink-function/src/main/java/com/dlink/ud/udtaf/Top2WithRetract.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.ud.udtaf;
 
 import org.apache.flink.api.java.tuple.Tuple2;

dlink-gateway/src/main/java/com/dlink/gateway/AbstractGateway.java

@@ -17,11 +17,12 @@
  *
  */
 
-
 package com.dlink.gateway;
 
 import com.dlink.gateway.config.GatewayConfig;
+
 import org.apache.flink.configuration.Configuration;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

dlink-gateway/src/main/java/com/dlink/gateway/Gateway.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway;
 
 import com.dlink.assertion.Asserts;
@@ -26,6 +25,7 @@ import com.dlink.gateway.exception.GatewayException;
 import com.dlink.gateway.result.GatewayResult;
 import com.dlink.gateway.result.SavePointResult;
 import com.dlink.gateway.result.TestResult;
+
 import org.apache.flink.runtime.jobgraph.JobGraph;
 
 import java.util.Iterator;

dlink-gateway/src/main/java/com/dlink/gateway/GatewayType.java

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

dlink-gateway/src/main/java/com/dlink/gateway/config/ActionType.java

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

dlink-gateway/src/main/java/com/dlink/gateway/config/AppConfig.java

@@ -17,10 +17,10 @@
  *
  */
 
-
 package com.dlink.gateway.config;
 
 import com.dlink.assertion.Asserts;
+
 import lombok.Getter;
 import lombok.Setter;
 

dlink-gateway/src/main/java/com/dlink/gateway/config/ClusterConfig.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.config;
 
 import lombok.Getter;
@@ -60,11 +59,11 @@ public class ClusterConfig {
 
     @Override
     public String toString() {
-        return "ClusterConfig{" +
-            "flinkConfigPath='" + flinkConfigPath + '\'' +
-            ", flinkLibPath='" + flinkLibPath + '\'' +
-            ", yarnConfigPath='" + yarnConfigPath + '\'' +
-            ", appId='" + appId + '\'' +
-            '}';
+        return "ClusterConfig{"
+            + "flinkConfigPath='" + flinkConfigPath + '\''
+            + ", flinkLibPath='" + flinkLibPath + '\''
+            + ", yarnConfigPath='" + yarnConfigPath + '\''
+            + ", appId='" + appId + '\''
+            + '}';
     }
 }

dlink-gateway/src/main/java/com/dlink/gateway/config/ConfigPara.java

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

dlink-gateway/src/main/java/com/dlink/gateway/config/FlinkConfig.java

@@ -17,19 +17,20 @@
  *
  */
 
-
 package com.dlink.gateway.config;
 
 import com.dlink.assertion.Asserts;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * FlinkConfig
  *
@@ -87,9 +88,7 @@ public class FlinkConfig {
             }
             paras.forEach((JsonNode node) -> {
                 configMap.put(node.get("key").asText(), node.get("value").asText());
-//                        configParasList.add(new ConfigPara(node.get("key").asText(), node.get("value").asText()));
-                    }
-            );
+            });
         }
         return new FlinkConfig(jobName, jobId, ActionType.get(actionStr), SavePointType.get(savePointTypeStr), savePoint, configMap);
     }

dlink-gateway/src/main/java/com/dlink/gateway/config/GatewayConfig.java

@@ -17,19 +17,20 @@
  *
  */
 
-
 package com.dlink.gateway.config;
 
 import com.dlink.gateway.GatewayType;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * SubmitConfig
  *
@@ -90,8 +91,7 @@ public class GatewayConfig {
                 JsonNode paras = mapper.readTree(para.get("configParas").asText());
                 paras.forEach((JsonNode node) -> {
                     configMap.put(node.get("key").asText(), node.get("value").asText());
-                        }
-                );
+                });
                 config.getFlinkConfig().setConfiguration(configMap);
             } catch (JsonProcessingException e) {
                 e.printStackTrace();

dlink-gateway/src/main/java/com/dlink/gateway/config/SavePointStrategy.java

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

dlink-gateway/src/main/java/com/dlink/gateway/config/SavePointType.java

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

dlink-gateway/src/main/java/com/dlink/gateway/exception/GatewayException.java

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

dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java

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

dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesGateway.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.kubernetes;
 
 import com.dlink.assertion.Asserts;
@@ -34,7 +33,6 @@ import com.dlink.utils.LogUtil;
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.client.program.ClusterClient;
 import org.apache.flink.configuration.CheckpointingOptions;
-import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.DeploymentOptions;
 import org.apache.flink.configuration.GlobalConfiguration;
 import org.apache.flink.kubernetes.KubernetesClusterClientFactory;
@@ -45,7 +43,11 @@ import org.apache.flink.kubernetes.kubeclient.FlinkKubeClientFactory;
 import org.apache.flink.runtime.client.JobStatusMessage;
 import org.apache.flink.runtime.jobgraph.SavepointConfigOptions;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 /**

dlink-gateway/src/main/java/com/dlink/gateway/model/JobInfo.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.model;
 
 import lombok.Getter;

dlink-gateway/src/main/java/com/dlink/gateway/result/AbstractGatewayResult.java

@@ -17,15 +17,15 @@
  *
  */
 
-
 package com.dlink.gateway.result;
 
 import com.dlink.gateway.GatewayType;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.time.LocalDateTime;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * AbstractGatewayResult
  *

dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.result;
 
 import java.util.List;

dlink-gateway/src/main/java/com/dlink/gateway/result/KubernetesResult.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.result;
 
 import com.dlink.gateway.GatewayType;

dlink-gateway/src/main/java/com/dlink/gateway/result/SavePointResult.java

@@ -17,17 +17,17 @@
  *
  */
 
-
 package com.dlink.gateway.result;
 
 import com.dlink.gateway.GatewayType;
 import com.dlink.gateway.model.JobInfo;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * TODO
  *

dlink-gateway/src/main/java/com/dlink/gateway/result/TestResult.java

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

dlink-gateway/src/main/java/com/dlink/gateway/result/YarnResult.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.result;
 
 import com.dlink.gateway.GatewayType;

dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.yarn;
 
 import com.dlink.assertion.Asserts;
@@ -29,7 +28,6 @@ import com.dlink.gateway.result.GatewayResult;
 import com.dlink.gateway.result.YarnResult;
 import com.dlink.utils.LogUtil;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.client.deployment.ClusterSpecification;
 import org.apache.flink.client.deployment.application.ApplicationConfiguration;
 import org.apache.flink.client.program.ClusterClient;

dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnGateway.java

@@ -17,10 +17,20 @@
  *
  */
 
-
 package com.dlink.gateway.yarn;
 
+import com.dlink.assertion.Asserts;
+import com.dlink.gateway.AbstractGateway;
+import com.dlink.gateway.config.ActionType;
+import com.dlink.gateway.config.GatewayConfig;
+import com.dlink.gateway.config.SavePointType;
+import com.dlink.gateway.exception.GatewayException;
+import com.dlink.gateway.model.JobInfo;
+import com.dlink.gateway.result.SavePointResult;
+import com.dlink.gateway.result.TestResult;
 import com.dlink.utils.FlinkUtil;
+import com.dlink.utils.LogUtil;
+
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.client.deployment.ClusterRetrieveException;
 import org.apache.flink.client.program.ClusterClient;
@@ -56,17 +66,6 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 
-import com.dlink.assertion.Asserts;
-import com.dlink.gateway.AbstractGateway;
-import com.dlink.gateway.config.ActionType;
-import com.dlink.gateway.config.GatewayConfig;
-import com.dlink.gateway.config.SavePointType;
-import com.dlink.gateway.exception.GatewayException;
-import com.dlink.gateway.model.JobInfo;
-import com.dlink.gateway.result.SavePointResult;
-import com.dlink.gateway.result.TestResult;
-import com.dlink.utils.LogUtil;
-
 /**
  * YarnSubmiter
  *

dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java

@@ -17,7 +17,6 @@
  *
  */
 
-
 package com.dlink.gateway.yarn;
 
 import com.dlink.assertion.Asserts;
@@ -27,6 +26,7 @@ import com.dlink.gateway.exception.GatewayException;
 import com.dlink.gateway.result.GatewayResult;
 import com.dlink.gateway.result.YarnResult;
 import com.dlink.utils.LogUtil;
+
 import org.apache.flink.client.deployment.ClusterSpecification;
 import org.apache.flink.client.program.ClusterClient;
 import org.apache.flink.client.program.ClusterClientProvider;

dlink-gateway/src/test/java/com/dlink/gateway/GatewayTest.java

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