refactor(flink-query): 调试和部署 Flink 查询模块

service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/controller/FlinkController.java

@@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.service.flink.controller;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.lanyuanxiaoyao.service.configuration.entity.flink.*;
 import com.lanyuanxiaoyao.service.flink.service.FlinkService;
-import org.eclipse.collections.api.map.ImmutableMap;
+import org.eclipse.collections.api.list.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("flink")
-public class FlinkController implements FlinkService {
+public class FlinkController {
     private static final Logger logger = LoggerFactory.getLogger(FlinkController.class);
 
     private final FlinkService flinkService;
@@ -28,67 +28,56 @@ public class FlinkController implements FlinkService {
     }
 
     @GetMapping("/overview")
-    @Override
     public FlinkOverview overview(@RequestParam("url") String url) throws JsonProcessingException {
         return flinkService.overview(url);
     }
 
     @GetMapping("/config")
-    @Override
     public FlinkConfig config(@RequestParam("url") String url) throws JsonProcessingException {
         return flinkService.config(url);
     }
 
     @GetMapping("/job_manager_config")
-    @Override
-    public ImmutableMap<String, String> jobManagerConfig(@RequestParam("url") String url) throws JsonProcessingException {
+    public ImmutableList<FlinkKeyValue> jobManagerConfig(@RequestParam("url") String url) throws JsonProcessingException {
         return flinkService.jobManagerConfig(url);
     }
 
     @GetMapping("/vertex_overview")
-    @Override
     public FlinkVertexOverview vertexOverview(@RequestParam("url") String url) throws JsonProcessingException {
         return flinkService.vertexOverview(url);
     }
 
     @GetMapping("/vertex")
-    @Override
     public FlinkVertex vertex(@RequestParam("url") String url, @RequestParam("vertex_id") String vertexId) throws JsonProcessingException {
         return flinkService.vertex(url, vertexId);
     }
 
     @GetMapping("/vertex_config")
-    @Override
     public FlinkVertexConfig vertexConfig(@RequestParam("url") String url, @RequestParam("vertex_id") String vertexId) throws JsonProcessingException {
         return flinkService.vertexConfig(url, vertexId);
     }
 
     @GetMapping("/checkpoint_overview")
-    @Override
     public FlinkCheckpointOverview checkpointOverview(@RequestParam("url") String url, @RequestParam("vertex_id") String vertexId) throws JsonProcessingException {
         return flinkService.checkpointOverview(url, vertexId);
     }
 
     @GetMapping("/checkpoint")
-    @Override
     public FlinkCheckpoint checkpoint(@RequestParam("url") String url, @RequestParam("vertex_id") String vertexId, @RequestParam("checkpoint_id") String checkpointId) throws JsonProcessingException {
         return flinkService.checkpoint(url, vertexId, checkpointId);
     }
 
     @GetMapping("/checkpoint_config")
-    @Override
     public FlinkCheckpointConfig checkpointConfig(@RequestParam("url") String url, @RequestParam("vertex_id") String vertexId) throws JsonProcessingException {
         return flinkService.checkpointConfig(url, vertexId);
     }
 
     @GetMapping("/task_manager_overview")
-    @Override
     public FlinkTaskManagerOverview taskManagerOverview(@RequestParam("url") String url) throws JsonProcessingException {
         return flinkService.taskManagerOverview(url);
     }
 
     @GetMapping("/task_manager")
-    @Override
     public FlinkTaskManager taskManager(@RequestParam("url") String url, @RequestParam("task_manager_id") String taskManagerId) throws JsonProcessingException {
         return flinkService.taskManager(url, taskManagerId);
     }

service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/service/FlinkService.java

@@ -2,7 +2,7 @@ package com.lanyuanxiaoyao.service.flink.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.lanyuanxiaoyao.service.configuration.entity.flink.*;
-import org.eclipse.collections.api.map.ImmutableMap;
+import org.eclipse.collections.api.list.ImmutableList;
 
 /**
  * Flink 服务
@@ -15,7 +15,7 @@ public interface FlinkService {
 
     FlinkConfig config(String url) throws JsonProcessingException;
 
-    ImmutableMap<String, String> jobManagerConfig(String url) throws JsonProcessingException;
+    ImmutableList<FlinkKeyValue> jobManagerConfig(String url) throws JsonProcessingException;
 
     FlinkVertexOverview vertexOverview(String url) throws JsonProcessingException;
 

service-flink-query/src/main/java/com/lanyuanxiaoyao/service/flink/service/impl/FlinkServiceImpl.java

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lanyuanxiaoyao.service.configuration.entity.flink.*;
 import com.lanyuanxiaoyao.service.flink.service.FlinkService;
-import org.eclipse.collections.api.map.ImmutableMap;
+import org.eclipse.collections.api.list.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.Cacheable;
@@ -32,10 +32,16 @@ public class FlinkServiceImpl implements FlinkService {
     }
 
     private String get(String url, String path) {
-        try (HttpResponse response = HttpUtil.createGet(URLUtil.completeUrl(url, path))
+        String query = URLUtil.normalize(StrUtil.format("{}/{}", url, path));
+        logger.debug("Query: {}", query);
+        try (HttpResponse response = HttpUtil.createGet(query)
                 .setMaxRedirectCount(10)
                 .execute()) {
-            return response.body();
+            if (response.isOk()) {
+                return response.body();
+            } else {
+                throw new RuntimeException(StrUtil.format("{} {}", response.getStatus(), response.body()));
+            }
         }
     }
 
@@ -56,8 +62,8 @@ public class FlinkServiceImpl implements FlinkService {
     @Cacheable(value = "flink-jobmanager-config", sync = true)
     @Retryable(Throwable.class)
     @Override
-    public ImmutableMap<String, String> jobManagerConfig(String url) throws JsonProcessingException {
-        return mapper.readValue(get(url, "/v1/jobmanager/config"), new TypeReference<ImmutableMap<String, String>>() {
+    public ImmutableList<FlinkKeyValue> jobManagerConfig(String url) throws JsonProcessingException {
+        return mapper.readValue(get(url, "/v1/jobmanager/config"), new TypeReference<ImmutableList<FlinkKeyValue>>() {
         });
     }