From 92cfd6b56cb1adaa55c7b809f6124d1a5c7d817e Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Sat, 28 Oct 2023 20:05:25 +0800 Subject: [PATCH 1/4] [WIP] [Improve] Improve streampark-console core package module service name base on [3.1 Naming Style] --- .../core/controller/ApplicationController.java | 2 +- .../controller/ApplicationHistoryController.java | 14 +++++++------- .../core/controller/ConfigController.java | 2 +- .../core/controller/ProjectController.java | 4 ++-- .../core/controller/ResourceController.java | 2 +- .../core/controller/VariableController.java | 4 ++-- .../core/controller/YarnQueueController.java | 2 +- .../core/service/AppBuildPipeService.java | 2 +- .../core/service/ApplicationConfigService.java | 2 +- .../core/service/FlinkClusterService.java | 2 +- .../console/core/service/FlinkSqlService.java | 2 +- .../console/core/service/ProjectService.java | 6 +++--- .../console/core/service/ResourceService.java | 2 +- .../console/core/service/VariableService.java | 6 +++--- .../console/core/service/YarnQueueService.java | 2 +- .../application/ApplicationInfoService.java | 16 ++++++++-------- .../application/ApplicationManageService.java | 8 ++++---- .../impl/ApplicationInfoServiceImpl.java | 16 ++++++++-------- .../impl/ApplicationManageServiceImpl.java | 10 +++++----- .../service/impl/AppBuildPipeServiceImpl.java | 2 +- .../impl/ApplicationConfigServiceImpl.java | 2 +- .../service/impl/FlinkClusterServiceImpl.java | 2 +- .../core/service/impl/FlinkSqlServiceImpl.java | 2 +- .../core/service/impl/ProjectServiceImpl.java | 12 ++++++------ .../core/service/impl/ResourceServiceImpl.java | 6 +++--- .../core/service/impl/VariableServiceImpl.java | 14 +++++++------- .../core/service/impl/YarnQueueServiceImpl.java | 6 +++--- .../core/watcher/FlinkAppLostWatcher.java | 4 ++-- .../core/service/YarnQueueServiceTest.java | 4 ++-- 29 files changed, 79 insertions(+), 79 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java index ed9967c36e..0858b18a11 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java @@ -139,7 +139,7 @@ public RestResponse update(Application app) { @Operation(summary = "Get applications dashboard data") @PostMapping("dashboard") public RestResponse dashboard(Long teamId) { - Map map = applicationInfoService.dashboard(teamId); + Map map = applicationInfoService.getDashboardDataMap(teamId); return RestResponse.success(map); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java index 13b22edfae..5b3c756e0c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java @@ -48,7 +48,7 @@ public class ApplicationHistoryController { @PostMapping("uploadJars") @RequiresPermissions("app:create") public RestResponse listUploadJars() { - List jars = applicationInfoService.historyUploadJars(); + List jars = applicationInfoService.listHistoryUploadJars(); return RestResponse.success(jars); } @@ -56,7 +56,7 @@ public RestResponse listUploadJars() { @PostMapping("k8sNamespaces") @RequiresPermissions("app:create") public RestResponse listK8sNamespace() { - List namespaces = applicationInfoService.getRecentK8sNamespace(); + List namespaces = applicationInfoService.listRecentK8sNamespace(); return RestResponse.success(namespaces); } @@ -69,7 +69,7 @@ public RestResponse listSessionClusterId(int executionMode) { case KUBERNETES_NATIVE_SESSION: case YARN_SESSION: case REMOTE: - clusterIds = applicationInfoService.getRecentK8sClusterId(executionMode); + clusterIds = applicationInfoService.listRecentK8sClusterId(executionMode); break; default: clusterIds = new ArrayList<>(0); @@ -82,7 +82,7 @@ public RestResponse listSessionClusterId(int executionMode) { @PostMapping("flinkBaseImages") @RequiresPermissions("app:create") public RestResponse listFlinkBaseImage() { - List images = applicationInfoService.getRecentFlinkBaseImage(); + List images = applicationInfoService.listRecentFlinkBaseImage(); return RestResponse.success(images); } @@ -90,7 +90,7 @@ public RestResponse listFlinkBaseImage() { @PostMapping("flinkPodTemplates") @RequiresPermissions("app:create") public RestResponse listPodTemplate() { - List templates = applicationInfoService.getRecentK8sPodTemplate(); + List templates = applicationInfoService.listRecentK8sPodTemplate(); return RestResponse.success(templates); } @@ -98,7 +98,7 @@ public RestResponse listPodTemplate() { @PostMapping("flinkJmPodTemplates") @RequiresPermissions("app:create") public RestResponse listJmPodTemplate() { - List templates = applicationInfoService.getRecentK8sJmPodTemplate(); + List templates = applicationInfoService.listRecentK8sJmPodTemplate(); return RestResponse.success(templates); } @@ -106,7 +106,7 @@ public RestResponse listJmPodTemplate() { @PostMapping("flinkTmPodTemplates") @RequiresPermissions("app:create") public RestResponse listTmPodTemplate() { - List templates = applicationInfoService.getRecentK8sTmPodTemplate(); + List templates = applicationInfoService.listRecentK8sTmPodTemplate(); return RestResponse.success(templates); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java index ba4d59e15a..abe848d08d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java @@ -73,7 +73,7 @@ public RestResponse list(ApplicationConfig config, RestRequest request) { @Operation(summary = "List application config histories") @PostMapping("history") public RestResponse history(Application application) { - List history = applicationConfigService.history(application); + List history = applicationConfigService.list(application); return RestResponse.success(history); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java index 99e95e05b5..deac916742 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java @@ -127,7 +127,7 @@ public RestResponse gitCheck(Project project) { @Operation(summary = "Check the project") @PostMapping("exists") public RestResponse exists(Project project) { - boolean exists = projectService.checkExists(project); + boolean exists = projectService.exists(project); return RestResponse.success().data(exists); } @@ -155,7 +155,7 @@ public RestResponse listConf(Project project) { @Operation(summary = "List the team projects") @PostMapping("select") public RestResponse select(@RequestParam Long teamId) { - List list = projectService.findByTeamId(teamId); + List list = projectService.listByTeamId(teamId); return RestResponse.success().data(list); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java index a4608d134a..25b5f9eb60 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java @@ -91,7 +91,7 @@ public RestResponse deleteResource(@Valid Resource resource) { @Operation(summary = "List resource") @PostMapping("list") public RestResponse listResource(@RequestParam Long teamId) { - List resourceList = resourceService.findByTeamId(teamId); + List resourceList = resourceService.listByTeamId(teamId); return RestResponse.success(resourceList); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java index b57b4c4b8f..b698a83283 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java @@ -80,7 +80,7 @@ public RestResponse page(RestRequest restRequest, Variable variable) { @Operation(summary = "List variables") @PostMapping("list") public RestResponse variableList(@RequestParam Long teamId, String keyword) { - List variableList = variableService.findByTeamId(teamId, keyword); + List variableList = variableService.listByTeamId(teamId, keyword); for (Variable v : variableList) { v.dataMasking(); } @@ -91,7 +91,7 @@ public RestResponse variableList(@RequestParam Long teamId, String keyword) { @PostMapping("dependApps") @RequiresPermissions("variable:depend_apps") public RestResponse dependApps(RestRequest restRequest, Variable variable) { - IPage dependApps = variableService.dependAppsPage(variable, restRequest); + IPage dependApps = variableService.pageDependApps(variable, restRequest); return RestResponse.success(dependApps); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java index 85436e2d53..9edead6dc6 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java @@ -55,7 +55,7 @@ public class YarnQueueController { @ApiAccess @PostMapping("list") public RestResponse list(RestRequest restRequest, YarnQueue yarnQueue) { - IPage queuePage = yarnQueueService.findYarnQueues(yarnQueue, restRequest); + IPage queuePage = yarnQueueService.page(yarnQueue, restRequest); return RestResponse.success(queuePage); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/AppBuildPipeService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/AppBuildPipeService.java index 531626a396..a0ee7d0aba 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/AppBuildPipeService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/AppBuildPipeService.java @@ -55,7 +55,7 @@ public interface AppBuildPipeService extends IService { boolean allowToBuildNow(@Nonnull Long appId); /** list pipeline status on application id list */ - Map listPipelineStatus(List appIds); + Map listAppIdPipelineStatusMap(List appIds); /** * delete appBuildPipeline By application diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java index d3531b67fc..7d4293156e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java @@ -108,7 +108,7 @@ public interface ApplicationConfigService extends IService { * @param appParam The application for which to retrieve the history. * @return The list of application configurations representing the history. */ - List history(Application appParam); + List list(Application appParam); /** * Reads a template from a file or a database. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java index e15ba77e2e..e994c5aaca 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java @@ -49,7 +49,7 @@ public interface FlinkClusterService extends IService { Boolean existsByFlinkEnvId(Long id); - List getByExecutionModes(Collection executionModeEnums); + List listByExecutionModes(Collection executionModeEnums); void updateClusterState(Long id, ClusterState state); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java index 88b3f93c36..ffd19bc9b1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java @@ -52,7 +52,7 @@ public interface FlinkSqlService extends IService { FlinkSqlValidationResult verifySql(String sql, Long versionId); - List getByTeamId(Long teamId); + List listByTeamId(Long teamId); IPage page(Long appId, RestRequest request); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java index 647723a5d1..8fc9652380 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java @@ -40,7 +40,7 @@ public interface ProjectService extends IService { Boolean existsByTeamId(Long teamId); - List findByTeamId(Long teamId); + List listByTeamId(Long teamId); void build(Long id) throws Exception; @@ -54,7 +54,7 @@ public interface ProjectService extends IService { String getAppConfPath(Long id, String module); - List getApplications(Project project); + List list(Project project); - boolean checkExists(Project project); + boolean exists(Project project); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java index 4a47819117..97bd2c37e8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java @@ -81,7 +81,7 @@ public interface ResourceService extends IService { * @param teamId * @return team resources */ - List findByTeamId(Long teamId); + List listByTeamId(Long teamId); /** * change resource owner diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java index 82a3291516..1b007cdd2a 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java @@ -43,7 +43,7 @@ public interface VariableService extends IService { * @param teamId The ID of the team to filter the variables by. * @return A list of variables that belong to the specified team. */ - List findByTeamId(Long teamId); + List listByTeamId(Long teamId); /** * Retrieve a list of variables based on the team ID and search keywords. @@ -53,7 +53,7 @@ public interface VariableService extends IService { * nullable. * @return A List of Variable objects that match the specified team ID and search keywords. */ - List findByTeamId(Long teamId, String keyword); + List listByTeamId(Long teamId, String keyword); /** * Check if a team exists by teamId. @@ -102,7 +102,7 @@ public interface VariableService extends IService { * @param request The REST request containing additional parameters for retrieving the page. * @return An instance of IPage containing the dependent applications. */ - IPage dependAppsPage(Variable variable, RestRequest request); + IPage pageDependApps(Variable variable, RestRequest request); /** * Updates the given variable. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java index f6594901b8..056616f3a5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java @@ -27,7 +27,7 @@ public interface YarnQueueService extends IService { - IPage findYarnQueues(YarnQueue yarnQueue, RestRequest restRequest); + IPage page(YarnQueue yarnQueue, RestRequest restRequest); ResponseResult checkYarnQueue(YarnQueue yarnQueue); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java index dbcf723781..c86ce3cc1c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java @@ -157,7 +157,7 @@ public interface ApplicationInfoService extends IService { * @param teamId the ID of the team * @return a map containing the dashboard data */ - Map dashboard(Long teamId); + Map getDashboardDataMap(Long teamId); /** * Retrieves the Kubernetes start log for a specific ID with an optional offset and limit. @@ -175,7 +175,7 @@ public interface ApplicationInfoService extends IService { * * @return The list of recent Kubernetes namespaces as a List of Strings. */ - List getRecentK8sNamespace(); + List listRecentK8sNamespace(); /** * Retrieves the list of recent K8s cluster IDs based on the specified execution mode. @@ -184,40 +184,40 @@ public interface ApplicationInfoService extends IService { * mode 2: Test mode 3: Development mode -1: All modes * @return The list of recent K8s cluster IDs based on the specified execution mode. */ - List getRecentK8sClusterId(Integer executionMode); + List listRecentK8sClusterId(Integer executionMode); /** * Retrieves the list of recent Flink base images. * * @return a list of strings representing the recent Flink base images */ - List getRecentFlinkBaseImage(); + List listRecentFlinkBaseImage(); /** * Retrieves the recent K8s pod templates. * * @return a List of Strings representing the recent K8s pod templates. */ - List getRecentK8sPodTemplate(); + List listRecentK8sPodTemplate(); /** * Retrieves the list of recent Kubernetes Job Manager Pod templates. * * @return A List of string values representing the recent Kubernetes Job Manager Pod templates. */ - List getRecentK8sJmPodTemplate(); + List listRecentK8sJmPodTemplate(); /** * Retrieves the list of recent K8s TM pod templates. * * @return The list of recent K8s TM pod templates as a List of String objects. */ - List getRecentK8sTmPodTemplate(); + List listRecentK8sTmPodTemplate(); /** * Uploads a list of jars to the server for historical reference. * * @return A list of strings representing the names of the uploaded jars. */ - List historyUploadJars(); + List listHistoryUploadJars(); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationManageService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationManageService.java index 56aefe49d9..b214627637 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationManageService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/ApplicationManageService.java @@ -136,7 +136,7 @@ public interface ApplicationManageService extends IService { * @param id The project ID to search for applications. * @return A list of applications associated with the project ID. */ - List getByProjectId(Long id); + List listByProjectId(Long id); /** * Changes the ownership of all applications associated with a user. @@ -152,7 +152,7 @@ public interface ApplicationManageService extends IService { * @param teamId The ID of the team to retrieve the applications for. * @return A list of Application objects associated with the given team ID. */ - List getByTeamId(Long teamId); + List listByTeamId(Long teamId); /** * Retrieves a list of applications by team ID and execution modes. @@ -162,7 +162,7 @@ public interface ApplicationManageService extends IService { * @return A list of applications that belong to the specified team and have the specified * execution modes */ - List getByTeamIdAndExecutionModes( + List listByTeamIdAndExecutionModes( Long teamId, Collection executionModeEnums); /** @@ -170,5 +170,5 @@ List getByTeamIdAndExecutionModes( * * @return a list of applications be probing or need to probe. */ - List getProbeApps(); + List listProbeApps(); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java index 4d4829142d..b8f8b8a4ba 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java @@ -106,7 +106,7 @@ public class ApplicationInfoServiceImpl extends ServiceImpl dashboard(Long teamId) { + public Map getDashboardDataMap(Long teamId) { JobsOverview.Task overview = new JobsOverview.Task(); Integer totalJmMemory = 0; Integer totalTmMemory = 0; @@ -277,37 +277,37 @@ public boolean existsByFlinkEnvId(Long flinkEnvId) { } @Override - public List getRecentK8sNamespace() { + public List listRecentK8sNamespace() { return baseMapper.selectRecentK8sNamespaces(DEFAULT_HISTORY_RECORD_LIMIT); } @Override - public List getRecentK8sClusterId(Integer executionMode) { + public List listRecentK8sClusterId(Integer executionMode) { return baseMapper.selectRecentK8sClusterIds(executionMode, DEFAULT_HISTORY_RECORD_LIMIT); } @Override - public List getRecentFlinkBaseImage() { + public List listRecentFlinkBaseImage() { return baseMapper.selectRecentFlinkBaseImages(DEFAULT_HISTORY_RECORD_LIMIT); } @Override - public List getRecentK8sPodTemplate() { + public List listRecentK8sPodTemplate() { return baseMapper.selectRecentK8sPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT); } @Override - public List getRecentK8sJmPodTemplate() { + public List listRecentK8sJmPodTemplate() { return baseMapper.selectRecentK8sJmPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT); } @Override - public List getRecentK8sTmPodTemplate() { + public List listRecentK8sTmPodTemplate() { return baseMapper.selectRecentK8sTmPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT); } @Override - public List historyUploadJars() { + public List listHistoryUploadJars() { return Arrays.stream(LfsOperator.listDir(Workspace.of(LFS).APP_UPLOADS())) .filter(File::isFile) .sorted(Comparator.comparingLong(File::lastModified).reversed()) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java index cc2e7348b7..35367411ee 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java @@ -255,7 +255,7 @@ public IPage page(Application appParam, RestRequest request) { long now = System.currentTimeMillis(); List appIds = records.stream().map(Application::getId).collect(Collectors.toList()); - Map pipeStates = appBuildPipeService.listPipelineStatus(appIds); + Map pipeStates = appBuildPipeService.listAppIdPipelineStatusMap(appIds); List newRecords = records.stream() @@ -684,17 +684,17 @@ public void updateRelease(Application appParam) { } @Override - public List getByProjectId(Long id) { + public List listByProjectId(Long id) { return baseMapper.selectAppsByProjectId(id); } @Override - public List getByTeamId(Long teamId) { + public List listByTeamId(Long teamId) { return baseMapper.selectAppsByTeamId(teamId); } @Override - public List getByTeamIdAndExecutionModes( + public List listByTeamIdAndExecutionModes( Long teamId, @Nonnull Collection executionModeEnums) { return getBaseMapper() .selectList( @@ -707,7 +707,7 @@ public List getByTeamIdAndExecutionModes( .collect(Collectors.toSet()))); } - public List getProbeApps() { + public List listProbeApps() { return this.baseMapper.selectProbeApps(); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java index 15946b7f65..fdb45c9935 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java @@ -577,7 +577,7 @@ public boolean allowToBuildNow(@Nonnull Long appId) { } @Override - public Map listPipelineStatus(List appIds) { + public Map listAppIdPipelineStatusMap(List appIds) { if (CollectionUtils.isEmpty(appIds)) { return Collections.emptyMap(); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java index 84ff583a6b..b4e47f7b38 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java @@ -212,7 +212,7 @@ public IPage page(ApplicationConfig config, RestRequest reque } @Override - public List history(Application appParam) { + public List list(Application appParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(ApplicationConfig::getAppId, appParam.getId()) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java index 40cdff909e..866f41ba50 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java @@ -304,7 +304,7 @@ public Boolean existsByFlinkEnvId(Long flinkEnvId) { } @Override - public List getByExecutionModes(Collection executionModeEnums) { + public List listByExecutionModes(Collection executionModeEnums) { return getBaseMapper() .selectList( new LambdaQueryWrapper() diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java index cf02788b15..3f8e4c20a3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java @@ -210,7 +210,7 @@ public FlinkSqlValidationResult verifySql(String sql, Long versionId) { } @Override - public List getByTeamId(Long teamId) { + public List listByTeamId(Long teamId) { return this.baseMapper.selectSqlsByTeamId(teamId); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index 3eec515926..5b421ca81c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java @@ -142,7 +142,7 @@ public boolean update(Project projectParam) { if (projectParam.getBuildState() != null) { project.setBuildState(projectParam.getBuildState()); if (BuildStateEnum.NEED_REBUILD == BuildStateEnum.of(projectParam.getBuildState())) { - List applications = getApplications(project); + List applications = list(project); // Update deployment status applications.forEach( (app) -> { @@ -188,7 +188,7 @@ public Boolean existsByTeamId(Long teamId) { } @Override - public List findByTeamId(Long teamId) { + public List listByTeamId(Long teamId) { return this.baseMapper.selectProjectsByTeamId(teamId); } @@ -210,7 +210,7 @@ public void build(Long id) throws Exception { }, fileLogger -> { List applications = - this.applicationManageService.getByProjectId(project.getId()); + this.applicationManageService.listByProjectId(project.getId()); applications.forEach( (app) -> { fileLogger.info( @@ -271,12 +271,12 @@ public String getAppConfPath(Long id, String module) { } @Override - public List getApplications(Project project) { - return this.applicationManageService.getByProjectId(project.getId()); + public List list(Project project) { + return this.applicationManageService.listByProjectId(project.getId()); } @Override - public boolean checkExists(Project project) { + public boolean exists(Project project) { if (project.getId() != null) { Project proj = getById(project.getId()); if (proj.getName().equals(project.getName())) { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java index 52abfcbb2e..2394573b83 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java @@ -223,7 +223,7 @@ public void deleteResource(Resource resource) { this.removeById(resource); } - public List findByTeamId(Long teamId) { + public List listByTeamId(Long teamId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(Resource::getTeamId, teamId); return baseMapper.selectList(queryWrapper); @@ -493,13 +493,13 @@ private boolean isDependByApplications(Resource resource) { private List getResourceApplicationsById(Resource resource) { List dependApplications = new ArrayList<>(); - List applications = applicationManageService.getByTeamId(resource.getTeamId()); + List applications = applicationManageService.listByTeamId(resource.getTeamId()); Map applicationMap = applications.stream() .collect(Collectors.toMap(Application::getId, application -> application)); // Get the application that depends on this resource - List flinkSqls = flinkSqlService.getByTeamId(resource.getTeamId()); + List flinkSqls = flinkSqlService.listByTeamId(resource.getTeamId()); for (FlinkSql flinkSql : flinkSqls) { String sqlTeamResource = flinkSql.getTeamResource(); if (sqlTeamResource != null diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java index eb790a8ec9..bf757c4508 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java @@ -99,7 +99,7 @@ public IPage page(Variable variable, RestRequest request) { } @Override - public IPage dependAppsPage(Variable variable, RestRequest request) { + public IPage pageDependApps(Variable variable, RestRequest request) { List applications = getDependApplicationsByCode(variable); IPage page = new Page<>(); @@ -157,8 +157,8 @@ public Variable findByVariableCode(Long teamId, String variableCode) { * @return */ @Override - public List findByTeamId(Long teamId) { - return findByTeamId(teamId, null); + public List listByTeamId(Long teamId) { + return listByTeamId(teamId, null); } /** @@ -169,7 +169,7 @@ public List findByTeamId(Long teamId) { * @return */ @Override - public List findByTeamId(Long teamId, String keyword) { + public List listByTeamId(Long teamId, String keyword) { return baseMapper.selectVarsByTeamId(teamId, keyword); } @@ -185,7 +185,7 @@ public String replaceVariable(Long teamId, String mixed) { if (StringUtils.isBlank(mixed)) { return mixed; } - List variables = findByTeamId(teamId); + List variables = listByTeamId(teamId); if (CollectionUtils.isEmpty(variables)) { return mixed; } @@ -211,7 +211,7 @@ private boolean isDependByApplications(Variable variable) { private List getDependApplicationsByCode(Variable variable) { List dependApplications = new ArrayList<>(); - List applications = applicationManageService.getByTeamId(variable.getTeamId()); + List applications = applicationManageService.listByTeamId(variable.getTeamId()); Map applicationMap = applications.stream() .collect(Collectors.toMap(Application::getId, application -> application)); @@ -224,7 +224,7 @@ private List getDependApplicationsByCode(Variable variable) { } // Get the application that depends on this variable in flink sql - List flinkSqls = flinkSqlService.getByTeamId(variable.getTeamId()); + List flinkSqls = flinkSqlService.listByTeamId(variable.getTeamId()); for (FlinkSql flinkSql : flinkSqls) { if (isDepend(variable.getVariableCode(), DeflaterUtils.unzipString(flinkSql.getSql()))) { Application app = applicationMap.get(flinkSql.getAppId()); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java index e24d76b0fe..662e10f9fa 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java @@ -71,7 +71,7 @@ public class YarnQueueServiceImpl extends ServiceImpl findYarnQueues(YarnQueue yarnQueue, RestRequest request) { + public IPage page(YarnQueue yarnQueue, RestRequest request) { Utils.notNull(yarnQueue, "Yarn queue query params mustn't be null."); Utils.notNull(yarnQueue.getTeamId(), "Team id of yarn queue query params mustn't be null."); Page page = new Page<>(); @@ -217,7 +217,7 @@ public YarnQueue getYarnQueueByIdWithPreconditions(YarnQueue yarnQueue) { public void checkNotReferencedByFlinkClusters( @Nonnull String queueLabel, @Nonnull String operation) { List clustersReferenceYarnQueueLabel = - flinkClusterService.getByExecutionModes(Sets.newHashSet(FlinkExecutionMode.YARN_SESSION)) + flinkClusterService.listByExecutionModes(Sets.newHashSet(FlinkExecutionMode.YARN_SESSION)) .stream() .filter(flinkCluster -> StringUtils.equals(flinkCluster.getYarnQueue(), queueLabel)) .collect(Collectors.toList()); @@ -231,7 +231,7 @@ public void checkNotReferencedByApplications( @Nonnull Long teamId, @Nonnull String queueLabel, @Nonnull String operation) { List appsReferenceQueueLabel = applicationManageService - .getByTeamIdAndExecutionModes( + .listByTeamIdAndExecutionModes( teamId, Sets.newHashSet( FlinkExecutionMode.YARN_APPLICATION, FlinkExecutionMode.YARN_PER_JOB)) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java index 1ce68b735c..3096fbeee6 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java @@ -87,7 +87,7 @@ private void start() { public void watch(List applications) { List probeApplication = - applications.isEmpty() ? applicationManageService.getProbeApps() : applications; + applications.isEmpty() ? applicationManageService.listProbeApps() : applications; if (probeApplication.isEmpty()) { log.info("there is no application that needs to be probe"); return; @@ -113,7 +113,7 @@ private void updateState(List applications) { } private void handleProbeResults() { - List probeApps = applicationManageService.getProbeApps(); + List probeApps = applicationManageService.listProbeApps(); if (shouldRetry(probeApps)) { watch(probeApps); } else { diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java index 2d4eb70837..aab5ae40f9 100644 --- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java +++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java @@ -87,7 +87,7 @@ void testFindYarnQueues() { RestRequest request = new RestRequest(); request.setPageSize(2); request.setPageNum(1); - IPage yarnQueues = yarnQueueService.findYarnQueues(queryParams, request); + IPage yarnQueues = yarnQueueService.page(queryParams, request); assertThat( yarnQueues.getRecords().stream() .map(YarnQueue::getQueueLabel) @@ -97,7 +97,7 @@ void testFindYarnQueues() { // Test for 1st page, size = 2, order by create time with queue_label queryParams.setQueueLabel("q3"); IPage yarnQueuesWithQueueLabelLikeQuery = - yarnQueueService.findYarnQueues(queryParams, request); + yarnQueueService.page(queryParams, request); assertThat( yarnQueuesWithQueueLabelLikeQuery.getRecords().stream() .map(YarnQueue::getQueueLabel) From 1868835c87da4cf6093ad36e5452b0f26a6982f8 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Sat, 28 Oct 2023 20:23:45 +0800 Subject: [PATCH 2/4] [Style] code style update --- .../service/application/impl/ApplicationManageServiceImpl.java | 3 ++- .../console/core/service/impl/FlinkClusterServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java index 35367411ee..346a2f1219 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java @@ -255,7 +255,8 @@ public IPage page(Application appParam, RestRequest request) { long now = System.currentTimeMillis(); List appIds = records.stream().map(Application::getId).collect(Collectors.toList()); - Map pipeStates = appBuildPipeService.listAppIdPipelineStatusMap(appIds); + Map pipeStates = + appBuildPipeService.listAppIdPipelineStatusMap(appIds); List newRecords = records.stream() diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java index 866f41ba50..4473f77a37 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java @@ -304,7 +304,8 @@ public Boolean existsByFlinkEnvId(Long flinkEnvId) { } @Override - public List listByExecutionModes(Collection executionModeEnums) { + public List listByExecutionModes( + Collection executionModeEnums) { return getBaseMapper() .selectList( new LambdaQueryWrapper() From c2efebf15afb47bf195b426e20d19eee0ca780a3 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Tue, 31 Oct 2023 22:02:08 +0800 Subject: [PATCH 3/4] [Improve] update page to getPage --- .../console/core/controller/ApplicationController.java | 4 ++-- .../streampark/console/core/controller/ConfigController.java | 2 +- .../console/core/controller/FlinkSqlController.java | 2 +- .../streampark/console/core/controller/MessageController.java | 2 +- .../streampark/console/core/controller/ProjectController.java | 2 +- .../console/core/controller/ResourceController.java | 2 +- .../console/core/controller/SavePointController.java | 2 +- .../console/core/controller/VariableController.java | 4 ++-- .../console/core/controller/YarnQueueController.java | 2 +- .../console/core/service/ApplicationBackUpService.java | 2 +- .../console/core/service/ApplicationConfigService.java | 2 +- .../console/core/service/ApplicationLogService.java | 2 +- .../streampark/console/core/service/FlinkSqlService.java | 2 +- .../streampark/console/core/service/MessageService.java | 2 +- .../streampark/console/core/service/ProjectService.java | 2 +- .../streampark/console/core/service/ResourceService.java | 2 +- .../streampark/console/core/service/SavePointService.java | 2 +- .../streampark/console/core/service/VariableService.java | 4 ++-- .../streampark/console/core/service/YarnQueueService.java | 2 +- .../core/service/impl/ApplicationBackUpServiceImpl.java | 2 +- .../core/service/impl/ApplicationConfigServiceImpl.java | 2 +- .../console/core/service/impl/ApplicationLogServiceImpl.java | 2 +- .../console/core/service/impl/FlinkSqlServiceImpl.java | 2 +- .../console/core/service/impl/MessageServiceImpl.java | 2 +- .../console/core/service/impl/ProjectServiceImpl.java | 2 +- .../console/core/service/impl/ResourceServiceImpl.java | 2 +- .../console/core/service/impl/SavePointServiceImpl.java | 2 +- .../console/core/service/impl/VariableServiceImpl.java | 4 ++-- .../console/core/service/impl/YarnQueueServiceImpl.java | 2 +- .../streampark/console/core/service/YarnQueueServiceTest.java | 4 ++-- 30 files changed, 35 insertions(+), 35 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java index 0858b18a11..d8dd5d43c1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java @@ -319,14 +319,14 @@ public RestResponse getMain(Application application) { @Operation(summary = "List application backups") @PostMapping("backups") public RestResponse backups(ApplicationBackUp backUp, RestRequest request) { - IPage backups = backUpService.page(backUp, request); + IPage backups = backUpService.getPage(backUp, request); return RestResponse.success(backups); } @Operation(summary = "List application operation logs") @PostMapping("optionlog") public RestResponse optionlog(ApplicationLog applicationLog, RestRequest request) { - IPage applicationList = applicationLogService.page(applicationLog, request); + IPage applicationList = applicationLogService.getPage(applicationLog, request); return RestResponse.success(applicationList); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java index abe848d08d..376cf9ea65 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java @@ -66,7 +66,7 @@ public RestResponse template() { @Operation(summary = "List the application configs") @PostMapping("list") public RestResponse list(ApplicationConfig config, RestRequest request) { - IPage page = applicationConfigService.page(config, request); + IPage page = applicationConfigService.getPage(config, request); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java index 6e92cea063..2de639c510 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java @@ -90,7 +90,7 @@ public RestResponse verify(String sql, Long versionId, Long teamId) { @Operation(summary = "List the application sql") @PostMapping("list") public RestResponse list(Long appId, RestRequest request) { - IPage page = flinkSqlService.page(appId, request); + IPage page = flinkSqlService.getPage(appId, request); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java index 7fc544c4de..e0bfaf28b7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java @@ -46,7 +46,7 @@ public class MessageController { @PostMapping("notice") public RestResponse notice(Integer type, RestRequest request) { NoticeTypeEnum noticeTypeEnum = NoticeTypeEnum.of(type); - IPage pages = messageService.getUnRead(noticeTypeEnum, request); + IPage pages = messageService.getUnReadPage(noticeTypeEnum, request); return RestResponse.success(pages); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java index deac916742..1c1ffff6e5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java @@ -98,7 +98,7 @@ public RestResponse list(Project project, RestRequest restRequest) { if (project.getTeamId() == null) { return RestResponse.success(Collections.emptyList()); } - IPage page = projectService.page(project, restRequest); + IPage page = projectService.getPage(project, restRequest); return RestResponse.success().data(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java index 25b5f9eb60..1d640e2895 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java @@ -68,7 +68,7 @@ public RestResponse checkResource(@Valid Resource resource) throws Exception { @Operation(summary = "List resources") @PostMapping("page") public RestResponse page(RestRequest restRequest, Resource resource) { - IPage page = resourceService.page(resource, restRequest); + IPage page = resourceService.getPage(resource, restRequest); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java index e495473c1b..0cab3d6712 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java @@ -64,7 +64,7 @@ public RestResponse latest(Long appId) { @Operation(summary = "List application savepoint histories") @PostMapping("history") public RestResponse history(SavePoint savePoint, RestRequest request) { - IPage page = savePointService.page(savePoint, request); + IPage page = savePointService.getPage(savePoint, request); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java index b698a83283..a662df521a 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java @@ -63,7 +63,7 @@ public class VariableController { @PostMapping("page") @RequiresPermissions("variable:view") public RestResponse page(RestRequest restRequest, Variable variable) { - IPage page = variableService.page(variable, restRequest); + IPage page = variableService.getPage(variable, restRequest); for (Variable v : page.getRecords()) { v.dataMasking(); } @@ -91,7 +91,7 @@ public RestResponse variableList(@RequestParam Long teamId, String keyword) { @PostMapping("dependApps") @RequiresPermissions("variable:depend_apps") public RestResponse dependApps(RestRequest restRequest, Variable variable) { - IPage dependApps = variableService.pageDependApps(variable, restRequest); + IPage dependApps = variableService.getDependAppsPage(variable, restRequest); return RestResponse.success(dependApps); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java index 9edead6dc6..3fc5b5d6ed 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java @@ -55,7 +55,7 @@ public class YarnQueueController { @ApiAccess @PostMapping("list") public RestResponse list(RestRequest restRequest, YarnQueue yarnQueue) { - IPage queuePage = yarnQueueService.page(yarnQueue, restRequest); + IPage queuePage = yarnQueueService.getPage(yarnQueue, restRequest); return RestResponse.success(queuePage); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java index e4eed3c1fc..5f8df46e57 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java @@ -53,7 +53,7 @@ public interface ApplicationBackUpService extends IService { * @param request The {@link RestRequest} object used for pagination and sorting. * @return An {@link IPage} containing the retrieved {@link ApplicationBackUp} objects. */ - IPage page(ApplicationBackUp bakParam, RestRequest request); + IPage getPage(ApplicationBackUp bakParam, RestRequest request); /** * Rolls back the changes made by the specified application backup. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java index 7d4293156e..f8ff1d416f 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java @@ -100,7 +100,7 @@ public interface ApplicationConfigService extends IService { * @return an IPage containing the ApplicationConfig objects that match the filter criteria * specified in the config object, limited by the settings in the request object */ - IPage page(ApplicationConfig config, RestRequest request); + IPage getPage(ApplicationConfig config, RestRequest request); /** * Retrieves the history of application configurations for a given application. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java index 62585e71d6..36f51afd51 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java @@ -25,7 +25,7 @@ public interface ApplicationLogService extends IService { - IPage page(ApplicationLog applicationLog, RestRequest request); + IPage getPage(ApplicationLog applicationLog, RestRequest request); void removeApp(Long appId); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java index ffd19bc9b1..9c8029464f 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java @@ -54,5 +54,5 @@ public interface FlinkSqlService extends IService { List listByTeamId(Long teamId); - IPage page(Long appId, RestRequest request); + IPage getPage(Long appId, RestRequest request); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java index 0d33ff2ba1..569d4468e7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java @@ -28,5 +28,5 @@ public interface MessageService extends IService { void push(Message message); - IPage getUnRead(NoticeTypeEnum noticeTypeEnum, RestRequest request); + IPage getUnReadPage(NoticeTypeEnum noticeTypeEnum, RestRequest request); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java index 8fc9652380..b8189ac1d8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java @@ -36,7 +36,7 @@ public interface ProjectService extends IService { boolean delete(Long id); - IPage page(Project project, RestRequest restRequest); + IPage getPage(Project project, RestRequest restRequest); Boolean existsByTeamId(Long teamId); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java index 97bd2c37e8..d6efe50768 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java @@ -37,7 +37,7 @@ public interface ResourceService extends IService { * @param restRequest queryRequest * @return IPage */ - IPage page(Resource resource, RestRequest restRequest); + IPage getPage(Resource resource, RestRequest restRequest); /** * check resource exists by user id diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java index 20e772934a..ff7090adb3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java @@ -71,7 +71,7 @@ public interface SavePointService extends IService { * @param request The RestRequest object containing additional request parameters. * @return An instance of IPage representing the page of SavePoint objects. */ - IPage page(SavePoint savePoint, RestRequest request); + IPage getPage(SavePoint savePoint, RestRequest request); /** * Removes all savepoints for the specified application. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java index 1b007cdd2a..bd98979bf8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java @@ -35,7 +35,7 @@ public interface VariableService extends IService { * @param restRequest The query request containing search filters and pagination options. * @return An IPage object containing the found Variable objects matching the search criteria. */ - IPage page(Variable variable, RestRequest restRequest); + IPage getPage(Variable variable, RestRequest restRequest); /** * Retrieves a list of variables based on the team ID. @@ -102,7 +102,7 @@ public interface VariableService extends IService { * @param request The REST request containing additional parameters for retrieving the page. * @return An instance of IPage containing the dependent applications. */ - IPage pageDependApps(Variable variable, RestRequest request); + IPage getDependAppsPage(Variable variable, RestRequest request); /** * Updates the given variable. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java index 056616f3a5..61e723a8d7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java @@ -27,7 +27,7 @@ public interface YarnQueueService extends IService { - IPage page(YarnQueue yarnQueue, RestRequest restRequest); + IPage getPage(YarnQueue yarnQueue, RestRequest restRequest); ResponseResult checkYarnQueue(YarnQueue yarnQueue); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java index 72124b81d9..10efb6a97b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java @@ -62,7 +62,7 @@ public class ApplicationBackUpServiceImpl @Autowired private FlinkSqlService flinkSqlService; @Override - public IPage page(ApplicationBackUp bakParam, RestRequest request) { + public IPage getPage(ApplicationBackUp bakParam, RestRequest request) { Page page = new MybatisPager().getDefaultPage(request); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java index b4e47f7b38..efd632c63e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java @@ -202,7 +202,7 @@ public ApplicationConfig get(Long id) { } @Override - public IPage page(ApplicationConfig config, RestRequest request) { + public IPage getPage(ApplicationConfig config, RestRequest request) { Page page = new MybatisPager().getPage(request, "version", Constant.ORDER_DESC); IPage configList = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java index 7155020b43..83e4f69d6d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java @@ -40,7 +40,7 @@ public class ApplicationLogServiceImpl extends ServiceImpl page(ApplicationLog applicationLog, RestRequest request) { + public IPage getPage(ApplicationLog applicationLog, RestRequest request) { Page page = new MybatisPager().getPage(request, "option_time", Constant.ORDER_DESC); LambdaQueryWrapper queryWrapper = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java index 3f8e4c20a3..5f8ce25843 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java @@ -215,7 +215,7 @@ public List listByTeamId(Long teamId) { } @Override - public IPage page(Long appId, RestRequest request) { + public IPage getPage(Long appId, RestRequest request) { Page page = new MybatisPager().getPage(request, "version", Constant.ORDER_DESC); LambdaQueryWrapper queryWrapper = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java index 128c625a58..c7d4d1587e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java @@ -47,7 +47,7 @@ public void push(Message message) { } @Override - public IPage getUnRead(NoticeTypeEnum noticeTypeEnum, RestRequest request) { + public IPage getUnReadPage(NoticeTypeEnum noticeTypeEnum, RestRequest request) { Page page = new MybatisPager().getDefaultPage(request); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index 5b421ca81c..f1fb4f67a5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java @@ -177,7 +177,7 @@ public boolean delete(Long id) { } @Override - public IPage page(Project project, RestRequest request) { + public IPage getPage(Project project, RestRequest request) { Page page = new MybatisPager().getDefaultPage(request); return this.baseMapper.selectPage(page, project); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java index 2394573b83..7f04df6040 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java @@ -99,7 +99,7 @@ public class ResourceServiceImpl extends ServiceImpl @Autowired private FlinkSqlService flinkSqlService; @Override - public IPage page(Resource resource, RestRequest restRequest) { + public IPage getPage(Resource resource, RestRequest restRequest) { if (resource.getTeamId() == null) { return null; } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java index 60babca273..748c8d2510 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java @@ -212,7 +212,7 @@ public Boolean delete(Long id, Application appParam) throws InternalException { } @Override - public IPage page(SavePoint savePoint, RestRequest request) { + public IPage getPage(SavePoint savePoint, RestRequest request) { Page page = new MybatisPager().getPage(request, "trigger_time", Constant.ORDER_DESC); LambdaQueryWrapper queryWrapper = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java index bf757c4508..84411ea704 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java @@ -90,7 +90,7 @@ public void deleteVariable(Variable variable) { } @Override - public IPage page(Variable variable, RestRequest request) { + public IPage getPage(Variable variable, RestRequest request) { if (variable.getTeamId() == null) { return null; } @@ -99,7 +99,7 @@ public IPage page(Variable variable, RestRequest request) { } @Override - public IPage pageDependApps(Variable variable, RestRequest request) { + public IPage getDependAppsPage(Variable variable, RestRequest request) { List applications = getDependApplicationsByCode(variable); IPage page = new Page<>(); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java index 662e10f9fa..9958e3ecdf 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java @@ -71,7 +71,7 @@ public class YarnQueueServiceImpl extends ServiceImpl page(YarnQueue yarnQueue, RestRequest request) { + public IPage getPage(YarnQueue yarnQueue, RestRequest request) { Utils.notNull(yarnQueue, "Yarn queue query params mustn't be null."); Utils.notNull(yarnQueue.getTeamId(), "Team id of yarn queue query params mustn't be null."); Page page = new Page<>(); diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java index aab5ae40f9..2d2abe184e 100644 --- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java +++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java @@ -87,7 +87,7 @@ void testFindYarnQueues() { RestRequest request = new RestRequest(); request.setPageSize(2); request.setPageNum(1); - IPage yarnQueues = yarnQueueService.page(queryParams, request); + IPage yarnQueues = yarnQueueService.getPage(queryParams, request); assertThat( yarnQueues.getRecords().stream() .map(YarnQueue::getQueueLabel) @@ -97,7 +97,7 @@ void testFindYarnQueues() { // Test for 1st page, size = 2, order by create time with queue_label queryParams.setQueueLabel("q3"); IPage yarnQueuesWithQueueLabelLikeQuery = - yarnQueueService.page(queryParams, request); + yarnQueueService.getPage(queryParams, request); assertThat( yarnQueuesWithQueueLabelLikeQuery.getRecords().stream() .map(YarnQueue::getQueueLabel) From 6739d7027c37cd1487816dbb2f87838b127be130 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Wed, 1 Nov 2023 16:55:04 +0800 Subject: [PATCH 4/4] [Fix] fix projectService.listApps function name --- .../streampark/console/core/service/ProjectService.java | 2 +- .../console/core/service/impl/ProjectServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java index b8189ac1d8..7fc13cf256 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java @@ -54,7 +54,7 @@ public interface ProjectService extends IService { String getAppConfPath(Long id, String module); - List list(Project project); + List listApps(Project project); boolean exists(Project project); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index f1fb4f67a5..7d8ded31f1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java @@ -142,7 +142,7 @@ public boolean update(Project projectParam) { if (projectParam.getBuildState() != null) { project.setBuildState(projectParam.getBuildState()); if (BuildStateEnum.NEED_REBUILD == BuildStateEnum.of(projectParam.getBuildState())) { - List applications = list(project); + List applications = listApps(project); // Update deployment status applications.forEach( (app) -> { @@ -271,7 +271,7 @@ public String getAppConfPath(Long id, String module) { } @Override - public List list(Project project) { + public List listApps(Project project) { return this.applicationManageService.listByProjectId(project.getId()); }