spotless优化

.editorconfig

@@ -1,13 +1,13 @@
 root = true
 
-[*]
+[*.java]
 indent_style = space
 indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = false
-max_line_length = off
+max_line_length = 120
 
 [*.md]
 trim_trailing_whitespace = false

.spotless/eclipse-java-google-style.xml

@@ -89,8 +89,8 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<!-- 默认值为100太短了,改成400  -->
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="400"/>
+<!-- 默认值为100太短了,改成120  -->
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>

flink-yun-agent/src/main/java/com/isxcode/acorn/agent/run/FlinkClusterAcorn.java

@@ -32,9 +32,12 @@ public SubmitJobRes submitJob(SubmitJobReq submitJobReq) {
 
         // 提交作业
         String submitUrl = "http://" + restUrl + "/jars/" + fileName + "/run";
-        FlinkRestRunReq flinkRestRunReq = FlinkRestRunReq.builder().entryClass(submitJobReq.getEntryClass()).programArgs(submitJobReq.getProgramArgs()).build();
-        ResponseEntity<FlinkRestRunRes> flinkRestRunResResult = new RestTemplate().postForEntity(submitUrl, flinkRestRunReq, FlinkRestRunRes.class);
-        if (!HttpStatus.OK.equals(flinkRestRunResResult.getStatusCode()) || flinkRestRunResResult.getBody() == null || flinkRestRunResResult.getBody().getJobid() == null) {
+        FlinkRestRunReq flinkRestRunReq = FlinkRestRunReq.builder().entryClass(submitJobReq.getEntryClass())
+            .programArgs(submitJobReq.getProgramArgs()).build();
+        ResponseEntity<FlinkRestRunRes> flinkRestRunResResult =
+            new RestTemplate().postForEntity(submitUrl, flinkRestRunReq, FlinkRestRunRes.class);
+        if (!HttpStatus.OK.equals(flinkRestRunResResult.getStatusCode()) || flinkRestRunResResult.getBody() == null
+            || flinkRestRunResResult.getBody().getJobid() == null) {
             throw new IsxAppException("提交作业失败");
         }
         return SubmitJobRes.builder().jobId(flinkRestRunResResult.getBody().getJobid()).build();
@@ -52,9 +55,11 @@ public GetJobInfoRes getJobInfo(GetJobInfoReq getJobInfoReq) {
             throw new IsxAppException("提交作业失败");
         }
 
-        List<String> vertices = result.getBody().getVertices().stream().map(FlinkVerticesDto::getId).collect(Collectors.toList());
+        List<String> vertices =
+            result.getBody().getVertices().stream().map(FlinkVerticesDto::getId).collect(Collectors.toList());
 
-        return GetJobInfoRes.builder().jobId(result.getBody().getJid()).vertices(vertices).status(result.getBody().getState()).build();
+        return GetJobInfoRes.builder().jobId(result.getBody().getJid()).vertices(vertices)
+            .status(result.getBody().getState()).build();
     }
 
     @Override
@@ -64,14 +69,17 @@ public GetJobLogRes getJobLog(GetJobLogReq getJobLogReq) {
 
         // 判断作业是否成功
         String getStatusUrl = "http://" + restUrl + "/jobs/" + getJobLogReq.getJobId() + "/status";
-        ResponseEntity<FlinkRestStatusRes> result = new RestTemplate().getForEntity(getStatusUrl, FlinkRestStatusRes.class);
-        if (!HttpStatus.OK.equals(result.getStatusCode()) || result.getBody() == null || result.getBody().getStatus() == null) {
+        ResponseEntity<FlinkRestStatusRes> result =
+            new RestTemplate().getForEntity(getStatusUrl, FlinkRestStatusRes.class);
+        if (!HttpStatus.OK.equals(result.getStatusCode()) || result.getBody() == null
+            || result.getBody().getStatus() == null) {
             throw new IsxAppException("获取作业状态失败");
         }
 
         if ("FAILED".equals(result.getBody().getStatus())) {
             String getExceptionUrl = "http://" + restUrl + "/jobs/" + getJobLogReq.getJobId() + "/exceptions";
-            ResponseEntity<FlinkRestExceptionRes> exceptionResult = new RestTemplate().getForEntity(getExceptionUrl, FlinkRestExceptionRes.class);
+            ResponseEntity<FlinkRestExceptionRes> exceptionResult =
+                new RestTemplate().getForEntity(getExceptionUrl, FlinkRestExceptionRes.class);
             if (!HttpStatus.OK.equals(exceptionResult.getStatusCode())) {
                 throw new IsxAppException("提交作业失败");
             }
@@ -81,17 +89,22 @@ public GetJobLogRes getJobLog(GetJobLogReq getJobLogReq) {
             return GetJobLogRes.builder().log(exceptionResult.getBody().getRootException()).build();
         } else {
 
-            GetJobInfoRes jobInfo = getJobInfo(GetJobInfoReq.builder().jobId(getJobLogReq.getJobId()).flinkHome(getJobLogReq.getFlinkHome()).agentType(getJobLogReq.getAgentType()).build());
+            GetJobInfoRes jobInfo = getJobInfo(GetJobInfoReq.builder().jobId(getJobLogReq.getJobId())
+                .flinkHome(getJobLogReq.getFlinkHome()).agentType(getJobLogReq.getAgentType()).build());
 
-            String getVerticesUrl = "http://" + restUrl + "/jobs/" + getJobLogReq.getJobId() + "/vertices/" + jobInfo.getVertices().get(0);
-            ResponseEntity<FlinkRestVerticesRes> forEntity = new RestTemplate().getForEntity(getVerticesUrl, FlinkRestVerticesRes.class);
+            String getVerticesUrl =
+                "http://" + restUrl + "/jobs/" + getJobLogReq.getJobId() + "/vertices/" + jobInfo.getVertices().get(0);
+            ResponseEntity<FlinkRestVerticesRes> forEntity =
+                new RestTemplate().getForEntity(getVerticesUrl, FlinkRestVerticesRes.class);
 
             // 查询taskmanager的日志
             String taskmanagerId = forEntity.getBody().getSubtasks().get(0).getTaskmanagerId();
             String getLogUrl = "http://" + restUrl + "/taskmanagers/" + taskmanagerId + "/log";
             ResponseEntity<String> log = new RestTemplate().getForEntity(getLogUrl, String.class);
 
-            String logRegex = "job " + getJobLogReq.getJobId() + " from resource manager with leader id.*?Close JobManager connection for job " + getJobLogReq.getJobId();
+            String logRegex = "job " + getJobLogReq.getJobId()
+                + " from resource manager with leader id.*?Close JobManager connection for job "
+                + getJobLogReq.getJobId();
             Pattern pattern = Pattern.compile(logRegex, Pattern.DOTALL);
             Matcher matcher = pattern.matcher(Objects.requireNonNull(log.getBody()));
             if (matcher.find()) {
@@ -149,7 +162,8 @@ public String uploadAppResource(SubmitJobReq submitJobReq, String restUrl) {
         param.add("jarfile", new FileSystemResource(new File(submitJobReq.getAppResource())));
         HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(param, headers);
 
-        ResponseEntity<FlinkRestUploadRes> result = restTemplate.exchange(uploadUrl, HttpMethod.POST, requestEntity, FlinkRestUploadRes.class);
+        ResponseEntity<FlinkRestUploadRes> result =
+            restTemplate.exchange(uploadUrl, HttpMethod.POST, requestEntity, FlinkRestUploadRes.class);
         if (!HttpStatus.OK.equals(result.getStatusCode())) {
             throw new IsxAppException("提交资源文件异常");
         }

flink-yun-agent/src/main/java/com/isxcode/acorn/agent/run/KubernetesAcorn.java

@@ -32,31 +32,39 @@ public SubmitJobRes submitJob(SubmitJobReq submitJobReq) {
         Configuration flinkConfig = GlobalConfiguration.loadConfiguration();
         flinkConfig.set(DeploymentOptions.TARGET, KubernetesDeploymentTarget.APPLICATION.getName());
         flinkConfig.set(PipelineOptions.NAME, submitJobReq.getAppName());
-        flinkConfig.set(ApplicationConfiguration.APPLICATION_ARGS, Collections.singletonList(submitJobReq.getProgramArgs()));
+        flinkConfig.set(ApplicationConfiguration.APPLICATION_ARGS,
+            Collections.singletonList(submitJobReq.getProgramArgs()));
         flinkConfig.set(ApplicationConfiguration.APPLICATION_MAIN_CLASS, submitJobReq.getEntryClass());
         flinkConfig.set(PipelineOptions.JARS, Collections.singletonList("local:///opt/flink/examples/app.jar"));
         flinkConfig.set(KubernetesConfigOptions.CLUSTER_ID, "zhiliuyun-cluster-" + System.currentTimeMillis());
-        flinkConfig.set(KubernetesConfigOptions.REST_SERVICE_EXPOSED_TYPE, KubernetesConfigOptions.ServiceExposedType.NodePort);
-        flinkConfig.set(KubernetesConfigOptions.CONTAINER_IMAGE_PULL_POLICY, KubernetesConfigOptions.ImagePullPolicy.IfNotPresent);
+        flinkConfig.set(KubernetesConfigOptions.REST_SERVICE_EXPOSED_TYPE,
+            KubernetesConfigOptions.ServiceExposedType.NodePort);
+        flinkConfig.set(KubernetesConfigOptions.CONTAINER_IMAGE_PULL_POLICY,
+            KubernetesConfigOptions.ImagePullPolicy.IfNotPresent);
         flinkConfig.set(KubernetesConfigOptions.NAMESPACE, "zhiliuyun-space");
         flinkConfig.set(KubernetesConfigOptions.KUBERNETES_SERVICE_ACCOUNT, "zhiliuyun");
         flinkConfig.set(KubernetesConfigOptions.CONTAINER_IMAGE, "flink:1.18.1-scala_2.12");
         flinkConfig.set(KubernetesConfigOptions.TASK_MANAGER_CPU, 2.0);
-        flinkConfig.set(KubernetesConfigOptions.KUBERNETES_POD_TEMPLATE, "/Users/ispong/isxcode/flink-yun/flink-yun-dist/pod/pod-template.yaml");
+        flinkConfig.set(KubernetesConfigOptions.KUBERNETES_POD_TEMPLATE,
+            "/Users/ispong/isxcode/flink-yun/flink-yun-dist/pod/pod-template.yaml");
         flinkConfig.set(KubernetesConfigOptions.FLINK_LOG_DIR, "/log");
         flinkConfig.set(DeploymentOptionsInternal.CONF_DIR, submitJobReq.getFlinkHome() + "/conf");
         flinkConfig.set(JobManagerOptions.TOTAL_PROCESS_MEMORY, MemorySize.parse("2g"));
         flinkConfig.set(TaskManagerOptions.TOTAL_PROCESS_MEMORY, MemorySize.parse("2g"));
         flinkConfig.set(TaskManagerOptions.NUM_TASK_SLOTS, 1);
         flinkConfig.set(KubernetesConfigOptions.KUBERNETES_HOSTNETWORK_ENABLED, true);
 
-        ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder().setMasterMemoryMB(1024).setTaskManagerMemoryMB(1024).setSlotsPerTaskManager(2).createClusterSpecification();
+        ClusterSpecification clusterSpecification =
+            new ClusterSpecification.ClusterSpecificationBuilder().setMasterMemoryMB(1024).setTaskManagerMemoryMB(1024)
+                .setSlotsPerTaskManager(2).createClusterSpecification();
 
         ApplicationConfiguration applicationConfiguration = ApplicationConfiguration.fromConfiguration(flinkConfig);
         applicationConfiguration.applyToConfiguration(flinkConfig);
         KubernetesClusterClientFactory kubernetesClusterClientFactory = new KubernetesClusterClientFactory();
-        try (KubernetesClusterDescriptor clusterDescriptor = kubernetesClusterClientFactory.createClusterDescriptor(flinkConfig)) {
-            ClusterClientProvider<String> clusterClientProvider = clusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration);
+        try (KubernetesClusterDescriptor clusterDescriptor =
+                 kubernetesClusterClientFactory.createClusterDescriptor(flinkConfig)) {
+            ClusterClientProvider<String> clusterClientProvider =
+                clusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration);
             System.out.println(clusterClientProvider.getClusterClient().getClusterId());
             System.out.println(clusterClientProvider.getClusterClient().getWebInterfaceURL());
             return null;
@@ -75,8 +83,10 @@ public GetJobInfoRes getJobInfo(GetJobInfoReq getJobInfoReq) {
         flinkConfig.set(KubernetesConfigOptions.KUBERNETES_SERVICE_ACCOUNT, "zhiliuyun");
 
         KubernetesClusterClientFactory kubernetesClusterClientFactory = new KubernetesClusterClientFactory();
-        try (KubernetesClusterDescriptor clusterDescriptor = kubernetesClusterClientFactory.createClusterDescriptor(flinkConfig)) {
-            ClusterClientProvider<String> clusterClientProvider = clusterDescriptor.retrieve(getJobInfoReq.getClusterId());
+        try (KubernetesClusterDescriptor clusterDescriptor =
+                 kubernetesClusterClientFactory.createClusterDescriptor(flinkConfig)) {
+            ClusterClientProvider<String> clusterClientProvider =
+                clusterDescriptor.retrieve(getJobInfoReq.getClusterId());
             System.out.println(clusterClientProvider.getClusterClient().getWebInterfaceURL());
             return null;
         } catch (Exception e) {

flink-yun-agent/src/main/java/com/isxcode/acorn/agent/run/YarnAcorn.java

@@ -40,26 +40,31 @@ public SubmitJobRes submitJob(SubmitJobReq submitJobReq) {
         flinkConfig.set(PipelineOptions.NAME, submitJobReq.getAppName());
         flinkConfig.set(ApplicationConfiguration.APPLICATION_ARGS, singletonList(submitJobReq.getProgramArgs()));
         flinkConfig.set(ApplicationConfiguration.APPLICATION_MAIN_CLASS, submitJobReq.getEntryClass());
-        flinkConfig.set(PipelineOptions.JARS, singletonList("/Users/ispong/isxcode/flink-yun/flink-yun-plugins/flink-sql-execute-plugin/build/libs/flink-sql-execute-plugin.jar"));
+        flinkConfig.set(PipelineOptions.JARS, singletonList(
+            "/Users/ispong/isxcode/flink-yun/flink-yun-plugins/flink-sql-execute-plugin/build/libs/flink-sql-execute-plugin.jar"));
         flinkConfig.set(DeploymentOptionsInternal.CONF_DIR, submitJobReq.getFlinkHome() + "/conf");
         flinkConfig.set(JobManagerOptions.TOTAL_PROCESS_MEMORY, MemorySize.parse("2g"));
         flinkConfig.set(TaskManagerOptions.TOTAL_PROCESS_MEMORY, MemorySize.parse("2g"));
         flinkConfig.set(TaskManagerOptions.NUM_TASK_SLOTS, 1);
         flinkConfig.set(YarnConfigOptions.APPLICATION_NAME, submitJobReq.getAppName());
-        flinkConfig.set(YarnConfigOptions.FLINK_DIST_JAR, "/Users/ispong/isxcode/flink-yun/flink-yun-dist/flink-min/lib/flink-dist-1.18.1.jar");
+        flinkConfig.set(YarnConfigOptions.FLINK_DIST_JAR,
+            "/Users/ispong/isxcode/flink-yun/flink-yun-dist/flink-min/lib/flink-dist-1.18.1.jar");
         List<String> libFile = new ArrayList<>();
         libFile.add("/Users/ispong/isxcode/flink-yun/flink-yun-dist/flink-min/lib");
         libFile.add("/Users/ispong/isxcode/flink-yun/resources/jdbc/system");
         libFile.add("/Users/ispong/isxcode/flink-yun/resources/cdc");
         flinkConfig.set(YarnConfigOptions.SHIP_FILES, libFile);
 
-        ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder().setMasterMemoryMB(1024).setTaskManagerMemoryMB(1024).setSlotsPerTaskManager(2).createClusterSpecification();
+        ClusterSpecification clusterSpecification =
+            new ClusterSpecification.ClusterSpecificationBuilder().setMasterMemoryMB(1024).setTaskManagerMemoryMB(1024)
+                .setSlotsPerTaskManager(2).createClusterSpecification();
 
         ApplicationConfiguration applicationConfiguration = ApplicationConfiguration.fromConfiguration(flinkConfig);
         applicationConfiguration.applyToConfiguration(flinkConfig);
         YarnClusterClientFactory yarnClusterClientFactory = new YarnClusterClientFactory();
         try (YarnClusterDescriptor clusterDescriptor = yarnClusterClientFactory.createClusterDescriptor(flinkConfig)) {
-            ClusterClientProvider<ApplicationId> applicationIdClusterClientProvider = clusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration);
+            ClusterClientProvider<ApplicationId> applicationIdClusterClientProvider =
+                clusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration);
             System.out.println(applicationIdClusterClientProvider.getClusterClient().getClusterId());
             System.out.println(applicationIdClusterClientProvider.getClusterClient().getWebInterfaceURL());
             return null;

flink-yun-backend/flink-yun-api/src/main/java/com/isxcode/acorn/api/api/pojos/req/AddApiReq.java

@@ -40,13 +40,17 @@ public class AddApiReq {
     @Schema(title = "如果用户使用自定义认证方式，需要填写", example = "")
     private List<HeaderTokenDto> reqHeader;
 
-    @Schema(title = "请求体", example = "{\n" + "    \"age\":\"$age\",\n" + "    \"page\":\"$system.page\",\n" + "    \"pageSize\":\"$system.pageSize\"\n" + "}")
+    @Schema(title = "请求体", example = "{\n" + "    \"age\":\"$age\",\n" + "    \"page\":\"$system.page\",\n"
+        + "    \"pageSize\":\"$system.pageSize\"\n" + "}")
     private String reqBody;
 
     @Schema(title = "执行sql", example = "select username, age from ispong_db where age > $age")
     private String apiSql;
 
-    @Schema(title = "响应体", example = "{\n" + "\"code\":\"200\",\n" + "    \"message\":\"返回成功\",\n" + "    \"$data\":[\n" + "        {\n" + "            \"username\":\"$username\"\n" + "            \"age\":\"$age\"\n" + "        }\n" + "    ],\n" + "    \"count\":\"$system.count\"\n" + "}")
+    @Schema(title = "响应体",
+        example = "{\n" + "\"code\":\"200\",\n" + "    \"message\":\"返回成功\",\n" + "    \"$data\":[\n" + "        {\n"
+            + "            \"username\":\"$username\"\n" + "            \"age\":\"$age\"\n" + "        }\n" + "    ],\n"
+            + "    \"count\":\"$system.count\"\n" + "}")
     private String resBody;
 
     @Schema(title = "备注", example = "备注123")

flink-yun-backend/flink-yun-api/src/main/java/com/isxcode/acorn/api/api/pojos/req/UpdateApiReq.java

@@ -41,13 +41,18 @@ public class UpdateApiReq {
     @Schema(title = "如果用户使用自定义认证方式，需要填写", example = "")
     private List<HeaderTokenDto> reqHeader;
 
-    @Schema(title = "请求体", example = "{\n" + "    \"age\":\"${age}\",\n" + "    \"page\":\"${page}\",\n" + "    \"pageSize\":\"${pageSize}\"\n" + "}")
+    @Schema(title = "请求体", example = "{\n" + "    \"age\":\"${age}\",\n" + "    \"page\":\"${page}\",\n"
+        + "    \"pageSize\":\"${pageSize}\"\n" + "}")
     private String reqBody;
 
-    @Schema(title = "执行sql", example = "select username, age from ispong_db where age > ${age} limit $[${page}-1)*${pageSize}],${pageSize}")
+    @Schema(title = "执行sql",
+        example = "select username, age from ispong_db where age > ${age} limit $[${page}-1)*${pageSize}],${pageSize}")
     private String apiSql;
 
-    @Schema(title = "响应体", example = "{\n" + "\"code\":\"200\",\n" + "    \"message\":\"返回成功\",\n" + "    \"data\":[\n" + "        ${\n" + "            \"username\":\"${username}\"\n" + "            \"age\":\"${age}\"\n" + "        }$\n" + "    ]\n" + "    \"count\":\"${COUNT}\"\n" + "}")
+    @Schema(title = "响应体",
+        example = "{\n" + "\"code\":\"200\",\n" + "    \"message\":\"返回成功\",\n" + "    \"data\":[\n" + "        ${\n"
+            + "            \"username\":\"${username}\"\n" + "            \"age\":\"${age}\"\n" + "        }$\n"
+            + "    ]\n" + "    \"count\":\"${COUNT}\"\n" + "}")
     private String resBody;
 
     @Schema(title = "备注", example = "备注123")

flink-yun-backend/flink-yun-api/src/main/java/com/isxcode/acorn/api/instance/pojos/ao/WfiWorkflowInstanceAo.java

@@ -22,7 +22,8 @@ public class WfiWorkflowInstanceAo {
 
     private String status;
 
-    public WfiWorkflowInstanceAo(String workflowInstanceId, String workflowName, Long duration, Date nextPlanDateTime, Date planStartDateTime, Date startDateTime, Date endDateTime, String status, String type) {
+    public WfiWorkflowInstanceAo(String workflowInstanceId, String workflowName, Long duration, Date nextPlanDateTime,
+        Date planStartDateTime, Date startDateTime, Date endDateTime, String status, String type) {
         this.workflowInstanceId = workflowInstanceId;
         this.workflowName = workflowName;
         this.duration = duration;