Unverified Commit 102b1b21 authored by Kerwin's avatar Kerwin Committed by GitHub

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

parent f44cfd2d
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.ud.udf; package com.dlink.ud.udf;
import org.apache.flink.table.functions.ScalarFunction; import org.apache.flink.table.functions.ScalarFunction;
......
...@@ -17,10 +17,8 @@ ...@@ -17,10 +17,8 @@
* *
*/ */
package com.dlink.ud.udtaf; package com.dlink.ud.udtaf;
import org.apache.flink.table.functions.TableAggregateFunction; import org.apache.flink.table.functions.TableAggregateFunction;
import org.apache.flink.util.Collector; import org.apache.flink.util.Collector;
...@@ -40,7 +38,6 @@ public class RowsToMap extends TableAggregateFunction<String, Map> { ...@@ -40,7 +38,6 @@ public class RowsToMap extends TableAggregateFunction<String, Map> {
return new HashMap(); return new HashMap();
} }
public void accumulate(Map acc, String cls, Object v, String key) { public void accumulate(Map acc, String cls, Object v, String key) {
String[] keys = key.split(","); String[] keys = key.split(",");
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.ud.udtaf; package com.dlink.ud.udtaf;
import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple2;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.ud.udtaf; package com.dlink.ud.udtaf;
import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple2;
......
...@@ -17,11 +17,12 @@ ...@@ -17,11 +17,12 @@
* *
*/ */
package com.dlink.gateway; package com.dlink.gateway;
import com.dlink.gateway.config.GatewayConfig; import com.dlink.gateway.config.GatewayConfig;
import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.Configuration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway; package com.dlink.gateway;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
...@@ -26,6 +25,7 @@ import com.dlink.gateway.exception.GatewayException; ...@@ -26,6 +25,7 @@ import com.dlink.gateway.exception.GatewayException;
import com.dlink.gateway.result.GatewayResult; import com.dlink.gateway.result.GatewayResult;
import com.dlink.gateway.result.SavePointResult; import com.dlink.gateway.result.SavePointResult;
import com.dlink.gateway.result.TestResult; import com.dlink.gateway.result.TestResult;
import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobGraph;
import java.util.Iterator; import java.util.Iterator;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway; package com.dlink.gateway;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
import lombok.Getter; import lombok.Getter;
...@@ -60,11 +59,11 @@ public class ClusterConfig { ...@@ -60,11 +59,11 @@ public class ClusterConfig {
@Override @Override
public String toString() { public String toString() {
return "ClusterConfig{" + return "ClusterConfig{"
"flinkConfigPath='" + flinkConfigPath + '\'' + + "flinkConfigPath='" + flinkConfigPath + '\''
", flinkLibPath='" + flinkLibPath + '\'' + + ", flinkLibPath='" + flinkLibPath + '\''
", yarnConfigPath='" + yarnConfigPath + '\'' + + ", yarnConfigPath='" + yarnConfigPath + '\''
", appId='" + appId + '\'' + + ", appId='" + appId + '\''
'}'; + '}';
} }
} }
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
/** /**
......
...@@ -17,19 +17,20 @@ ...@@ -17,19 +17,20 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.HashMap;
import java.util.Map;
/** /**
* FlinkConfig * FlinkConfig
* *
...@@ -86,10 +87,8 @@ public class FlinkConfig { ...@@ -86,10 +87,8 @@ public class FlinkConfig {
e.printStackTrace(); e.printStackTrace();
} }
paras.forEach((JsonNode node) -> { paras.forEach((JsonNode node) -> {
configMap.put(node.get("key").asText(), node.get("value").asText()); 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); return new FlinkConfig(jobName, jobId, ActionType.get(actionStr), SavePointType.get(savePointTypeStr), savePoint, configMap);
} }
......
...@@ -17,19 +17,20 @@ ...@@ -17,19 +17,20 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.HashMap;
import java.util.Map;
/** /**
* SubmitConfig * SubmitConfig
* *
...@@ -89,9 +90,8 @@ public class GatewayConfig { ...@@ -89,9 +90,8 @@ public class GatewayConfig {
Map<String, String> configMap = new HashMap<>(); Map<String, String> configMap = new HashMap<>();
JsonNode paras = mapper.readTree(para.get("configParas").asText()); JsonNode paras = mapper.readTree(para.get("configParas").asText());
paras.forEach((JsonNode node) -> { paras.forEach((JsonNode node) -> {
configMap.put(node.get("key").asText(), node.get("value").asText()); configMap.put(node.get("key").asText(), node.get("value").asText());
} });
);
config.getFlinkConfig().setConfiguration(configMap); config.getFlinkConfig().setConfiguration(configMap);
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
e.printStackTrace(); e.printStackTrace();
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
/** /**
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.config; package com.dlink.gateway.config;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.exception; package com.dlink.gateway.exception;
/** /**
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.kubernetes; package com.dlink.gateway.kubernetes;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.kubernetes; package com.dlink.gateway.kubernetes;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
...@@ -34,7 +33,6 @@ import com.dlink.utils.LogUtil; ...@@ -34,7 +33,6 @@ import com.dlink.utils.LogUtil;
import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobID;
import org.apache.flink.client.program.ClusterClient; import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.configuration.CheckpointingOptions; import org.apache.flink.configuration.CheckpointingOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.DeploymentOptions; import org.apache.flink.configuration.DeploymentOptions;
import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.kubernetes.KubernetesClusterClientFactory; import org.apache.flink.kubernetes.KubernetesClusterClientFactory;
...@@ -45,7 +43,11 @@ import org.apache.flink.kubernetes.kubeclient.FlinkKubeClientFactory; ...@@ -45,7 +43,11 @@ import org.apache.flink.kubernetes.kubeclient.FlinkKubeClientFactory;
import org.apache.flink.runtime.client.JobStatusMessage; import org.apache.flink.runtime.client.JobStatusMessage;
import org.apache.flink.runtime.jobgraph.SavepointConfigOptions; 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; import java.util.concurrent.CompletableFuture;
/** /**
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.model; package com.dlink.gateway.model;
import lombok.Getter; import lombok.Getter;
......
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
* *
*/ */
package com.dlink.gateway.result; package com.dlink.gateway.result;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* AbstractGatewayResult * AbstractGatewayResult
* *
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.result; package com.dlink.gateway.result;
import java.util.List; import java.util.List;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.result; package com.dlink.gateway.result;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
......
...@@ -17,17 +17,17 @@ ...@@ -17,17 +17,17 @@
* *
*/ */
package com.dlink.gateway.result; package com.dlink.gateway.result;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
import com.dlink.gateway.model.JobInfo; import com.dlink.gateway.model.JobInfo;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import lombok.Getter;
import lombok.Setter;
/** /**
* TODO * TODO
* *
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.result; package com.dlink.gateway.result;
/** /**
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.result; package com.dlink.gateway.result;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.yarn; package com.dlink.gateway.yarn;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
...@@ -29,7 +28,6 @@ import com.dlink.gateway.result.GatewayResult; ...@@ -29,7 +28,6 @@ import com.dlink.gateway.result.GatewayResult;
import com.dlink.gateway.result.YarnResult; import com.dlink.gateway.result.YarnResult;
import com.dlink.utils.LogUtil; import com.dlink.utils.LogUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.deployment.application.ApplicationConfiguration; import org.apache.flink.client.deployment.application.ApplicationConfiguration;
import org.apache.flink.client.program.ClusterClient; import org.apache.flink.client.program.ClusterClient;
......
...@@ -17,10 +17,20 @@ ...@@ -17,10 +17,20 @@
* *
*/ */
package com.dlink.gateway.yarn; 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.FlinkUtil;
import com.dlink.utils.LogUtil;
import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobID;
import org.apache.flink.client.deployment.ClusterRetrieveException; import org.apache.flink.client.deployment.ClusterRetrieveException;
import org.apache.flink.client.program.ClusterClient; import org.apache.flink.client.program.ClusterClient;
...@@ -56,17 +66,6 @@ import java.util.UUID; ...@@ -56,17 +66,6 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors; 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 * YarnSubmiter
* *
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway.yarn; package com.dlink.gateway.yarn;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
...@@ -27,6 +26,7 @@ import com.dlink.gateway.exception.GatewayException; ...@@ -27,6 +26,7 @@ import com.dlink.gateway.exception.GatewayException;
import com.dlink.gateway.result.GatewayResult; import com.dlink.gateway.result.GatewayResult;
import com.dlink.gateway.result.YarnResult; import com.dlink.gateway.result.YarnResult;
import com.dlink.utils.LogUtil; import com.dlink.utils.LogUtil;
import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.program.ClusterClient; import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.client.program.ClusterClientProvider; import org.apache.flink.client.program.ClusterClientProvider;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* *
*/ */
package com.dlink.gateway; package com.dlink.gateway;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment