This is an automated email from the ASF dual-hosted git repository.
panyuepeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 57b9b78dd [ISSUE-3064][Improve] Improve streampark-console core
package module service name base on [3.1 Naming Style] (#3295)
57b9b78dd is described below
commit 57b9b78dd4f230ee6403fa9a45ded7695042f04f
Author: VampireAchao <[email protected]>
AuthorDate: Wed Nov 1 17:21:56 2023 +0800
[ISSUE-3064][Improve] Improve streampark-console core package module
service name base on [3.1 Naming Style] (#3295)
---
.../console/core/controller/ApplicationController.java | 6 +++---
.../core/controller/ApplicationHistoryController.java | 14 +++++++-------
.../console/core/controller/ConfigController.java | 4 ++--
.../console/core/controller/FlinkSqlController.java | 2 +-
.../console/core/controller/MessageController.java | 2 +-
.../console/core/controller/ProjectController.java | 6 +++---
.../console/core/controller/ResourceController.java | 4 ++--
.../console/core/controller/SavePointController.java | 2 +-
.../console/core/controller/VariableController.java | 6 +++---
.../console/core/controller/YarnQueueController.java | 2 +-
.../console/core/service/AppBuildPipeService.java | 2 +-
.../console/core/service/ApplicationBackUpService.java | 2 +-
.../console/core/service/ApplicationConfigService.java | 4 ++--
.../console/core/service/ApplicationLogService.java | 2 +-
.../console/core/service/FlinkClusterService.java | 2 +-
.../streampark/console/core/service/FlinkSqlService.java | 4 ++--
.../streampark/console/core/service/MessageService.java | 2 +-
.../streampark/console/core/service/ProjectService.java | 8 ++++----
.../streampark/console/core/service/ResourceService.java | 4 ++--
.../console/core/service/SavePointService.java | 2 +-
.../streampark/console/core/service/VariableService.java | 8 ++++----
.../console/core/service/YarnQueueService.java | 2 +-
.../core/service/application/ApplicationInfoService.java | 16 ++++++++--------
.../service/application/ApplicationManageService.java | 8 ++++----
.../application/impl/ApplicationInfoServiceImpl.java | 16 ++++++++--------
.../application/impl/ApplicationManageServiceImpl.java | 11 ++++++-----
.../core/service/impl/AppBuildPipeServiceImpl.java | 2 +-
.../core/service/impl/ApplicationBackUpServiceImpl.java | 2 +-
.../core/service/impl/ApplicationConfigServiceImpl.java | 4 ++--
.../core/service/impl/ApplicationLogServiceImpl.java | 2 +-
.../core/service/impl/FlinkClusterServiceImpl.java | 3 ++-
.../console/core/service/impl/FlinkSqlServiceImpl.java | 4 ++--
.../console/core/service/impl/MessageServiceImpl.java | 2 +-
.../console/core/service/impl/ProjectServiceImpl.java | 14 +++++++-------
.../console/core/service/impl/ResourceServiceImpl.java | 8 ++++----
.../console/core/service/impl/SavePointServiceImpl.java | 2 +-
.../console/core/service/impl/VariableServiceImpl.java | 16 ++++++++--------
.../console/core/service/impl/YarnQueueServiceImpl.java | 6 +++---
.../console/core/watcher/FlinkAppLostWatcher.java | 4 ++--
.../console/core/service/YarnQueueServiceTest.java | 4 ++--
40 files changed, 108 insertions(+), 106 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 ed9967c36..d8dd5d43c 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 class ApplicationController {
@Operation(summary = "Get applications dashboard data")
@PostMapping("dashboard")
public RestResponse dashboard(Long teamId) {
- Map<String, Serializable> map = applicationInfoService.dashboard(teamId);
+ Map<String, Serializable> map =
applicationInfoService.getDashboardDataMap(teamId);
return RestResponse.success(map);
}
@@ -319,14 +319,14 @@ public class ApplicationController {
@Operation(summary = "List application backups")
@PostMapping("backups")
public RestResponse backups(ApplicationBackUp backUp, RestRequest request) {
- IPage<ApplicationBackUp> backups = backUpService.page(backUp, request);
+ IPage<ApplicationBackUp> 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<ApplicationLog> applicationList =
applicationLogService.page(applicationLog, request);
+ IPage<ApplicationLog> 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/ApplicationHistoryController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java
index 13b22edfa..5b3c756e0 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<String> jars = applicationInfoService.historyUploadJars();
+ List<String> jars = applicationInfoService.listHistoryUploadJars();
return RestResponse.success(jars);
}
@@ -56,7 +56,7 @@ public class ApplicationHistoryController {
@PostMapping("k8sNamespaces")
@RequiresPermissions("app:create")
public RestResponse listK8sNamespace() {
- List<String> namespaces = applicationInfoService.getRecentK8sNamespace();
+ List<String> namespaces = applicationInfoService.listRecentK8sNamespace();
return RestResponse.success(namespaces);
}
@@ -69,7 +69,7 @@ public class ApplicationHistoryController {
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 class ApplicationHistoryController {
@PostMapping("flinkBaseImages")
@RequiresPermissions("app:create")
public RestResponse listFlinkBaseImage() {
- List<String> images = applicationInfoService.getRecentFlinkBaseImage();
+ List<String> images = applicationInfoService.listRecentFlinkBaseImage();
return RestResponse.success(images);
}
@@ -90,7 +90,7 @@ public class ApplicationHistoryController {
@PostMapping("flinkPodTemplates")
@RequiresPermissions("app:create")
public RestResponse listPodTemplate() {
- List<String> templates = applicationInfoService.getRecentK8sPodTemplate();
+ List<String> templates = applicationInfoService.listRecentK8sPodTemplate();
return RestResponse.success(templates);
}
@@ -98,7 +98,7 @@ public class ApplicationHistoryController {
@PostMapping("flinkJmPodTemplates")
@RequiresPermissions("app:create")
public RestResponse listJmPodTemplate() {
- List<String> templates =
applicationInfoService.getRecentK8sJmPodTemplate();
+ List<String> templates =
applicationInfoService.listRecentK8sJmPodTemplate();
return RestResponse.success(templates);
}
@@ -106,7 +106,7 @@ public class ApplicationHistoryController {
@PostMapping("flinkTmPodTemplates")
@RequiresPermissions("app:create")
public RestResponse listTmPodTemplate() {
- List<String> templates =
applicationInfoService.getRecentK8sTmPodTemplate();
+ List<String> 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 ba4d59e15..376cf9ea6 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,14 +66,14 @@ public class ConfigController {
@Operation(summary = "List the application configs")
@PostMapping("list")
public RestResponse list(ApplicationConfig config, RestRequest request) {
- IPage<ApplicationConfig> page = applicationConfigService.page(config,
request);
+ IPage<ApplicationConfig> page = applicationConfigService.getPage(config,
request);
return RestResponse.success(page);
}
@Operation(summary = "List application config histories")
@PostMapping("history")
public RestResponse history(Application application) {
- List<ApplicationConfig> history =
applicationConfigService.history(application);
+ List<ApplicationConfig> 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/FlinkSqlController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
index 6e92cea06..2de639c51 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 class FlinkSqlController {
@Operation(summary = "List the application sql")
@PostMapping("list")
public RestResponse list(Long appId, RestRequest request) {
- IPage<FlinkSql> page = flinkSqlService.page(appId, request);
+ IPage<FlinkSql> 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 7fc544c4d..e0bfaf28b 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<Message> pages = messageService.getUnRead(noticeTypeEnum, request);
+ IPage<Message> 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 99e95e05b..1c1ffff6e 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 class ProjectController {
if (project.getTeamId() == null) {
return RestResponse.success(Collections.emptyList());
}
- IPage<Project> page = projectService.page(project, restRequest);
+ IPage<Project> page = projectService.getPage(project, restRequest);
return RestResponse.success().data(page);
}
@@ -127,7 +127,7 @@ public class ProjectController {
@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 class ProjectController {
@Operation(summary = "List the team projects")
@PostMapping("select")
public RestResponse select(@RequestParam Long teamId) {
- List<Project> list = projectService.findByTeamId(teamId);
+ List<Project> 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 a4608d134..1d640e289 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 class ResourceController {
@Operation(summary = "List resources")
@PostMapping("page")
public RestResponse page(RestRequest restRequest, Resource resource) {
- IPage<Resource> page = resourceService.page(resource, restRequest);
+ IPage<Resource> page = resourceService.getPage(resource, restRequest);
return RestResponse.success(page);
}
@@ -91,7 +91,7 @@ public class ResourceController {
@Operation(summary = "List resource")
@PostMapping("list")
public RestResponse listResource(@RequestParam Long teamId) {
- List<Resource> resourceList = resourceService.findByTeamId(teamId);
+ List<Resource> 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/SavePointController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java
index e495473c1..0cab3d671 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 class SavePointController {
@Operation(summary = "List application savepoint histories")
@PostMapping("history")
public RestResponse history(SavePoint savePoint, RestRequest request) {
- IPage<SavePoint> page = savePointService.page(savePoint, request);
+ IPage<SavePoint> 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 b57b4c4b8..a662df521 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<Variable> page = variableService.page(variable, restRequest);
+ IPage<Variable> page = variableService.getPage(variable, restRequest);
for (Variable v : page.getRecords()) {
v.dataMasking();
}
@@ -80,7 +80,7 @@ public class VariableController {
@Operation(summary = "List variables")
@PostMapping("list")
public RestResponse variableList(@RequestParam Long teamId, String keyword) {
- List<Variable> variableList = variableService.findByTeamId(teamId,
keyword);
+ List<Variable> variableList = variableService.listByTeamId(teamId,
keyword);
for (Variable v : variableList) {
v.dataMasking();
}
@@ -91,7 +91,7 @@ public class VariableController {
@PostMapping("dependApps")
@RequiresPermissions("variable:depend_apps")
public RestResponse dependApps(RestRequest restRequest, Variable variable) {
- IPage<Application> dependApps = variableService.dependAppsPage(variable,
restRequest);
+ IPage<Application> 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 85436e2d5..3fc5b5d6e 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<YarnQueue> queuePage = yarnQueueService.findYarnQueues(yarnQueue,
restRequest);
+ IPage<YarnQueue> 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/AppBuildPipeService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/AppBuildPipeService.java
index 531626a39..a0ee7d0ab 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<AppBuildPipeline> {
boolean allowToBuildNow(@Nonnull Long appId);
/** list pipeline status on application id list */
- Map<Long, PipelineStatusEnum> listPipelineStatus(List<Long> appIds);
+ Map<Long, PipelineStatusEnum> listAppIdPipelineStatusMap(List<Long> appIds);
/**
* delete appBuildPipeline By application
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 e4eed3c1f..5f8df46e5 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<ApplicationBackUp> {
* @param request The {@link RestRequest} object used for pagination and
sorting.
* @return An {@link IPage} containing the retrieved {@link
ApplicationBackUp} objects.
*/
- IPage<ApplicationBackUp> page(ApplicationBackUp bakParam, RestRequest
request);
+ IPage<ApplicationBackUp> 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 d3531b67f..f8ff1d416 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<ApplicationConfig> {
* @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<ApplicationConfig> page(ApplicationConfig config, RestRequest request);
+ IPage<ApplicationConfig> getPage(ApplicationConfig config, RestRequest
request);
/**
* Retrieves the history of application configurations for a given
application.
@@ -108,7 +108,7 @@ public interface ApplicationConfigService extends
IService<ApplicationConfig> {
* @param appParam The application for which to retrieve the history.
* @return The list of application configurations representing the history.
*/
- List<ApplicationConfig> history(Application appParam);
+ List<ApplicationConfig> 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/ApplicationLogService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java
index 62585e71d..36f51afd5 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 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface ApplicationLogService extends IService<ApplicationLog> {
- IPage<ApplicationLog> page(ApplicationLog applicationLog, RestRequest
request);
+ IPage<ApplicationLog> 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/FlinkClusterService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java
index e15ba77e2..e994c5aac 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<FlinkCluster> {
Boolean existsByFlinkEnvId(Long id);
- List<FlinkCluster> getByExecutionModes(Collection<FlinkExecutionMode>
executionModeEnums);
+ List<FlinkCluster> listByExecutionModes(Collection<FlinkExecutionMode>
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 88b3f93c3..9c8029464 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<FlinkSql> {
FlinkSqlValidationResult verifySql(String sql, Long versionId);
- List<FlinkSql> getByTeamId(Long teamId);
+ List<FlinkSql> listByTeamId(Long teamId);
- IPage<FlinkSql> page(Long appId, RestRequest request);
+ IPage<FlinkSql> 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 0d33ff2ba..569d4468e 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<Message> {
void push(Message message);
- IPage<Message> getUnRead(NoticeTypeEnum noticeTypeEnum, RestRequest request);
+ IPage<Message> 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 647723a5d..7fc13cf25 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,11 +36,11 @@ public interface ProjectService extends IService<Project> {
boolean delete(Long id);
- IPage<Project> page(Project project, RestRequest restRequest);
+ IPage<Project> getPage(Project project, RestRequest restRequest);
Boolean existsByTeamId(Long teamId);
- List<Project> findByTeamId(Long teamId);
+ List<Project> listByTeamId(Long teamId);
void build(Long id) throws Exception;
@@ -54,7 +54,7 @@ public interface ProjectService extends IService<Project> {
String getAppConfPath(Long id, String module);
- List<Application> getApplications(Project project);
+ List<Application> listApps(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 4a4781911..d6efe5076 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<Resource> {
* @param restRequest queryRequest
* @return IPage
*/
- IPage<Resource> page(Resource resource, RestRequest restRequest);
+ IPage<Resource> getPage(Resource resource, RestRequest restRequest);
/**
* check resource exists by user id
@@ -81,7 +81,7 @@ public interface ResourceService extends IService<Resource> {
* @param teamId
* @return team resources
*/
- List<Resource> findByTeamId(Long teamId);
+ List<Resource> listByTeamId(Long teamId);
/**
* change resource owner
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 20e772934..ff7090adb 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<SavePoint>
{
* @param request The RestRequest object containing additional request
parameters.
* @return An instance of IPage<SavePoint> representing the page of
SavePoint objects.
*/
- IPage<SavePoint> page(SavePoint savePoint, RestRequest request);
+ IPage<SavePoint> 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 82a329151..bd98979bf 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<Variable> {
* @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<Variable> page(Variable variable, RestRequest restRequest);
+ IPage<Variable> getPage(Variable variable, RestRequest restRequest);
/**
* Retrieves a list of variables based on the team ID.
@@ -43,7 +43,7 @@ public interface VariableService extends IService<Variable> {
* @param teamId The ID of the team to filter the variables by.
* @return A list of variables that belong to the specified team.
*/
- List<Variable> findByTeamId(Long teamId);
+ List<Variable> 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<Variable> {
* nullable.
* @return A List of Variable objects that match the specified team ID and
search keywords.
*/
- List<Variable> findByTeamId(Long teamId, String keyword);
+ List<Variable> listByTeamId(Long teamId, String keyword);
/**
* Check if a team exists by teamId.
@@ -102,7 +102,7 @@ public interface VariableService extends IService<Variable>
{
* @param request The REST request containing additional parameters for
retrieving the page.
* @return An instance of IPage<Application> containing the dependent
applications.
*/
- IPage<Application> dependAppsPage(Variable variable, RestRequest request);
+ IPage<Application> 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 f6594901b..61e723a8d 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 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface YarnQueueService extends IService<YarnQueue> {
- IPage<YarnQueue> findYarnQueues(YarnQueue yarnQueue, RestRequest
restRequest);
+ IPage<YarnQueue> getPage(YarnQueue yarnQueue, RestRequest restRequest);
ResponseResult<String> 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 dbcf72378..c86ce3cc1 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<Application> {
* @param teamId the ID of the team
* @return a map containing the dashboard data
*/
- Map<String, Serializable> dashboard(Long teamId);
+ Map<String, Serializable> 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<Application> {
*
* @return The list of recent Kubernetes namespaces as a List of Strings.
*/
- List<String> getRecentK8sNamespace();
+ List<String> listRecentK8sNamespace();
/**
* Retrieves the list of recent K8s cluster IDs based on the specified
execution mode.
@@ -184,40 +184,40 @@ public interface ApplicationInfoService extends
IService<Application> {
* 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<String> getRecentK8sClusterId(Integer executionMode);
+ List<String> listRecentK8sClusterId(Integer executionMode);
/**
* Retrieves the list of recent Flink base images.
*
* @return a list of strings representing the recent Flink base images
*/
- List<String> getRecentFlinkBaseImage();
+ List<String> listRecentFlinkBaseImage();
/**
* Retrieves the recent K8s pod templates.
*
* @return a List of Strings representing the recent K8s pod templates.
*/
- List<String> getRecentK8sPodTemplate();
+ List<String> 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<String> getRecentK8sJmPodTemplate();
+ List<String> 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<String> getRecentK8sTmPodTemplate();
+ List<String> 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<String> historyUploadJars();
+ List<String> 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 56aefe49d..b21462763 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<Application> {
* @param id The project ID to search for applications.
* @return A list of applications associated with the project ID.
*/
- List<Application> getByProjectId(Long id);
+ List<Application> listByProjectId(Long id);
/**
* Changes the ownership of all applications associated with a user.
@@ -152,7 +152,7 @@ public interface ApplicationManageService extends
IService<Application> {
* @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<Application> getByTeamId(Long teamId);
+ List<Application> listByTeamId(Long teamId);
/**
* Retrieves a list of applications by team ID and execution modes.
@@ -162,7 +162,7 @@ public interface ApplicationManageService extends
IService<Application> {
* @return A list of applications that belong to the specified team and have
the specified
* execution modes
*/
- List<Application> getByTeamIdAndExecutionModes(
+ List<Application> listByTeamIdAndExecutionModes(
Long teamId, Collection<FlinkExecutionMode> executionModeEnums);
/**
@@ -170,5 +170,5 @@ public interface ApplicationManageService extends
IService<Application> {
*
* @return a list of applications be probing or need to probe.
*/
- List<Application> getProbeApps();
+ List<Application> 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 4d4829142..b8f8b8a4b 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<ApplicationMapper, A
@Autowired private FlinkClusterWatcher flinkClusterWatcher;
@Override
- public Map<String, Serializable> dashboard(Long teamId) {
+ public Map<String, Serializable> getDashboardDataMap(Long teamId) {
JobsOverview.Task overview = new JobsOverview.Task();
Integer totalJmMemory = 0;
Integer totalTmMemory = 0;
@@ -277,37 +277,37 @@ public class ApplicationInfoServiceImpl extends
ServiceImpl<ApplicationMapper, A
}
@Override
- public List<String> getRecentK8sNamespace() {
+ public List<String> listRecentK8sNamespace() {
return baseMapper.selectRecentK8sNamespaces(DEFAULT_HISTORY_RECORD_LIMIT);
}
@Override
- public List<String> getRecentK8sClusterId(Integer executionMode) {
+ public List<String> listRecentK8sClusterId(Integer executionMode) {
return baseMapper.selectRecentK8sClusterIds(executionMode,
DEFAULT_HISTORY_RECORD_LIMIT);
}
@Override
- public List<String> getRecentFlinkBaseImage() {
+ public List<String> listRecentFlinkBaseImage() {
return
baseMapper.selectRecentFlinkBaseImages(DEFAULT_HISTORY_RECORD_LIMIT);
}
@Override
- public List<String> getRecentK8sPodTemplate() {
+ public List<String> listRecentK8sPodTemplate() {
return
baseMapper.selectRecentK8sPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
}
@Override
- public List<String> getRecentK8sJmPodTemplate() {
+ public List<String> listRecentK8sJmPodTemplate() {
return
baseMapper.selectRecentK8sJmPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
}
@Override
- public List<String> getRecentK8sTmPodTemplate() {
+ public List<String> listRecentK8sTmPodTemplate() {
return
baseMapper.selectRecentK8sTmPodTemplates(DEFAULT_HISTORY_POD_TMPL_RECORD_LIMIT);
}
@Override
- public List<String> historyUploadJars() {
+ public List<String> 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 cc2e7348b..346a2f121 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 class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
long now = System.currentTimeMillis();
List<Long> appIds =
records.stream().map(Application::getId).collect(Collectors.toList());
- Map<Long, PipelineStatusEnum> pipeStates =
appBuildPipeService.listPipelineStatus(appIds);
+ Map<Long, PipelineStatusEnum> pipeStates =
+ appBuildPipeService.listAppIdPipelineStatusMap(appIds);
List<Application> newRecords =
records.stream()
@@ -684,17 +685,17 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
}
@Override
- public List<Application> getByProjectId(Long id) {
+ public List<Application> listByProjectId(Long id) {
return baseMapper.selectAppsByProjectId(id);
}
@Override
- public List<Application> getByTeamId(Long teamId) {
+ public List<Application> listByTeamId(Long teamId) {
return baseMapper.selectAppsByTeamId(teamId);
}
@Override
- public List<Application> getByTeamIdAndExecutionModes(
+ public List<Application> listByTeamIdAndExecutionModes(
Long teamId, @Nonnull Collection<FlinkExecutionMode> executionModeEnums)
{
return getBaseMapper()
.selectList(
@@ -707,7 +708,7 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
.collect(Collectors.toSet())));
}
- public List<Application> getProbeApps() {
+ public List<Application> 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 15946b7f6..fdb45c993 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 class AppBuildPipeServiceImpl
}
@Override
- public Map<Long, PipelineStatusEnum> listPipelineStatus(List<Long> appIds) {
+ public Map<Long, PipelineStatusEnum> listAppIdPipelineStatusMap(List<Long>
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/ApplicationBackUpServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java
index 72124b81d..10efb6a97 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<ApplicationBackUp> page(ApplicationBackUp bakParam, RestRequest
request) {
+ public IPage<ApplicationBackUp> getPage(ApplicationBackUp bakParam,
RestRequest request) {
Page<ApplicationBackUp> page = new
MybatisPager<ApplicationBackUp>().getDefaultPage(request);
LambdaQueryWrapper<ApplicationBackUp> queryWrapper =
new LambdaQueryWrapper<ApplicationBackUp>()
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 84ff583a6..efd632c63 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 class ApplicationConfigServiceImpl
}
@Override
- public IPage<ApplicationConfig> page(ApplicationConfig config, RestRequest
request) {
+ public IPage<ApplicationConfig> getPage(ApplicationConfig config,
RestRequest request) {
Page<ApplicationConfig> page =
new MybatisPager<ApplicationConfig>().getPage(request, "version",
Constant.ORDER_DESC);
IPage<ApplicationConfig> configList =
@@ -212,7 +212,7 @@ public class ApplicationConfigServiceImpl
}
@Override
- public List<ApplicationConfig> history(Application appParam) {
+ public List<ApplicationConfig> list(Application appParam) {
LambdaQueryWrapper<ApplicationConfig> queryWrapper =
new LambdaQueryWrapper<ApplicationConfig>()
.eq(ApplicationConfig::getAppId, appParam.getId())
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 7155020b4..83e4f69d6 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<ApplicationLogMapper,
implements ApplicationLogService {
@Override
- public IPage<ApplicationLog> page(ApplicationLog applicationLog, RestRequest
request) {
+ public IPage<ApplicationLog> getPage(ApplicationLog applicationLog,
RestRequest request) {
Page<ApplicationLog> page =
new MybatisPager<ApplicationLog>().getPage(request, "option_time",
Constant.ORDER_DESC);
LambdaQueryWrapper<ApplicationLog> queryWrapper =
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 40cdff909..4473f77a3 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 class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
}
@Override
- public List<FlinkCluster> getByExecutionModes(Collection<FlinkExecutionMode>
executionModeEnums) {
+ public List<FlinkCluster> listByExecutionModes(
+ Collection<FlinkExecutionMode> executionModeEnums) {
return getBaseMapper()
.selectList(
new LambdaQueryWrapper<FlinkCluster>()
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 cf02788b1..5f8ce2584 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,12 +210,12 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
}
@Override
- public List<FlinkSql> getByTeamId(Long teamId) {
+ public List<FlinkSql> listByTeamId(Long teamId) {
return this.baseMapper.selectSqlsByTeamId(teamId);
}
@Override
- public IPage<FlinkSql> page(Long appId, RestRequest request) {
+ public IPage<FlinkSql> getPage(Long appId, RestRequest request) {
Page<FlinkSql> page =
new MybatisPager<FlinkSql>().getPage(request, "version",
Constant.ORDER_DESC);
LambdaQueryWrapper<FlinkSql> 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 128c625a5..c7d4d1587 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 class MessageServiceImpl extends
ServiceImpl<MessageMapper, Message>
}
@Override
- public IPage<Message> getUnRead(NoticeTypeEnum noticeTypeEnum, RestRequest
request) {
+ public IPage<Message> getUnReadPage(NoticeTypeEnum noticeTypeEnum,
RestRequest request) {
Page<Message> page = new MybatisPager<Message>().getDefaultPage(request);
LambdaQueryWrapper<Message> queryWrapper =
new LambdaQueryWrapper<Message>()
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 3eec51592..7d8ded31f 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 class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
if (projectParam.getBuildState() != null) {
project.setBuildState(projectParam.getBuildState());
if (BuildStateEnum.NEED_REBUILD ==
BuildStateEnum.of(projectParam.getBuildState())) {
- List<Application> applications = getApplications(project);
+ List<Application> applications = listApps(project);
// Update deployment status
applications.forEach(
(app) -> {
@@ -177,7 +177,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
}
@Override
- public IPage<Project> page(Project project, RestRequest request) {
+ public IPage<Project> getPage(Project project, RestRequest request) {
Page<Project> page = new MybatisPager<Project>().getDefaultPage(request);
return this.baseMapper.selectPage(page, project);
}
@@ -188,7 +188,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
}
@Override
- public List<Project> findByTeamId(Long teamId) {
+ public List<Project> listByTeamId(Long teamId) {
return this.baseMapper.selectProjectsByTeamId(teamId);
}
@@ -210,7 +210,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
},
fileLogger -> {
List<Application> applications =
-
this.applicationManageService.getByProjectId(project.getId());
+
this.applicationManageService.listByProjectId(project.getId());
applications.forEach(
(app) -> {
fileLogger.info(
@@ -271,12 +271,12 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
}
@Override
- public List<Application> getApplications(Project project) {
- return this.applicationManageService.getByProjectId(project.getId());
+ public List<Application> listApps(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 52abfcbb2..7f04df604 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<ResourceMapper, Resource>
@Autowired private FlinkSqlService flinkSqlService;
@Override
- public IPage<Resource> page(Resource resource, RestRequest restRequest) {
+ public IPage<Resource> getPage(Resource resource, RestRequest restRequest) {
if (resource.getTeamId() == null) {
return null;
}
@@ -223,7 +223,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
this.removeById(resource);
}
- public List<Resource> findByTeamId(Long teamId) {
+ public List<Resource> listByTeamId(Long teamId) {
LambdaQueryWrapper<Resource> queryWrapper =
new LambdaQueryWrapper<Resource>().eq(Resource::getTeamId, teamId);
return baseMapper.selectList(queryWrapper);
@@ -493,13 +493,13 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
private List<Application> getResourceApplicationsById(Resource resource) {
List<Application> dependApplications = new ArrayList<>();
- List<Application> applications =
applicationManageService.getByTeamId(resource.getTeamId());
+ List<Application> applications =
applicationManageService.listByTeamId(resource.getTeamId());
Map<Long, Application> applicationMap =
applications.stream()
.collect(Collectors.toMap(Application::getId, application ->
application));
// Get the application that depends on this resource
- List<FlinkSql> flinkSqls =
flinkSqlService.getByTeamId(resource.getTeamId());
+ List<FlinkSql> 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/SavePointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
index 60babca27..748c8d251 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 class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
}
@Override
- public IPage<SavePoint> page(SavePoint savePoint, RestRequest request) {
+ public IPage<SavePoint> getPage(SavePoint savePoint, RestRequest request) {
Page<SavePoint> page =
new MybatisPager<SavePoint>().getPage(request, "trigger_time",
Constant.ORDER_DESC);
LambdaQueryWrapper<SavePoint> 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 eb790a8ec..84411ea70 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 class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
}
@Override
- public IPage<Variable> page(Variable variable, RestRequest request) {
+ public IPage<Variable> getPage(Variable variable, RestRequest request) {
if (variable.getTeamId() == null) {
return null;
}
@@ -99,7 +99,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
}
@Override
- public IPage<Application> dependAppsPage(Variable variable, RestRequest
request) {
+ public IPage<Application> getDependAppsPage(Variable variable, RestRequest
request) {
List<Application> applications = getDependApplicationsByCode(variable);
IPage<Application> page = new Page<>();
@@ -157,8 +157,8 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
* @return
*/
@Override
- public List<Variable> findByTeamId(Long teamId) {
- return findByTeamId(teamId, null);
+ public List<Variable> listByTeamId(Long teamId) {
+ return listByTeamId(teamId, null);
}
/**
@@ -169,7 +169,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
* @return
*/
@Override
- public List<Variable> findByTeamId(Long teamId, String keyword) {
+ public List<Variable> listByTeamId(Long teamId, String keyword) {
return baseMapper.selectVarsByTeamId(teamId, keyword);
}
@@ -185,7 +185,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
if (StringUtils.isBlank(mixed)) {
return mixed;
}
- List<Variable> variables = findByTeamId(teamId);
+ List<Variable> variables = listByTeamId(teamId);
if (CollectionUtils.isEmpty(variables)) {
return mixed;
}
@@ -211,7 +211,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
private List<Application> getDependApplicationsByCode(Variable variable) {
List<Application> dependApplications = new ArrayList<>();
- List<Application> applications =
applicationManageService.getByTeamId(variable.getTeamId());
+ List<Application> applications =
applicationManageService.listByTeamId(variable.getTeamId());
Map<Long, Application> applicationMap =
applications.stream()
.collect(Collectors.toMap(Application::getId, application ->
application));
@@ -224,7 +224,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
}
// Get the application that depends on this variable in flink sql
- List<FlinkSql> flinkSqls =
flinkSqlService.getByTeamId(variable.getTeamId());
+ List<FlinkSql> 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 e24d76b0f..9958e3ecd 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<YarnQueueMapper, YarnQueue
@Autowired private FlinkClusterService flinkClusterService;
@Override
- public IPage<YarnQueue> findYarnQueues(YarnQueue yarnQueue, RestRequest
request) {
+ public IPage<YarnQueue> 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<YarnQueue> page = new Page<>();
@@ -217,7 +217,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
public void checkNotReferencedByFlinkClusters(
@Nonnull String queueLabel, @Nonnull String operation) {
List<FlinkCluster> 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 class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
@Nonnull Long teamId, @Nonnull String queueLabel, @Nonnull String
operation) {
List<Application> 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 1ce68b735..3096fbeee 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 @@ public class FlinkAppLostWatcher {
public void watch(List<Application> applications) {
List<Application> 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 @@ public class FlinkAppLostWatcher {
}
private void handleProbeResults() {
- List<Application> probeApps = applicationManageService.getProbeApps();
+ List<Application> 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 2d4eb7083..2d2abe184 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 @@ class YarnQueueServiceTest extends SpringUnitTestBase {
RestRequest request = new RestRequest();
request.setPageSize(2);
request.setPageNum(1);
- IPage<YarnQueue> yarnQueues = yarnQueueService.findYarnQueues(queryParams,
request);
+ IPage<YarnQueue> yarnQueues = yarnQueueService.getPage(queryParams,
request);
assertThat(
yarnQueues.getRecords().stream()
.map(YarnQueue::getQueueLabel)
@@ -97,7 +97,7 @@ class YarnQueueServiceTest extends SpringUnitTestBase {
// Test for 1st page, size = 2, order by create time with queue_label
queryParams.setQueueLabel("q3");
IPage<YarnQueue> yarnQueuesWithQueueLabelLikeQuery =
- yarnQueueService.findYarnQueues(queryParams, request);
+ yarnQueueService.getPage(queryParams, request);
assertThat(
yarnQueuesWithQueueLabelLikeQuery.getRecords().stream()
.map(YarnQueue::getQueueLabel)
