This is an automated email from the ASF dual-hosted git repository.
benjobs 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 3c8bd0b36 [Improve] Improve streampark-console core package module
service remove method name base on [3.1 Naming Style] (#3310)
3c8bd0b36 is described below
commit 3c8bd0b36e463d01fa3284fb561dc5fcce36feab
Author: VampireAchao <[email protected]>
AuthorDate: Sun Nov 5 16:39:48 2023 +0800
[Improve] Improve streampark-console core package module service remove
method name base on [3.1 Naming Style] (#3310)
* [Improve] Improve streampark-console core package module service remove
method name base on [3.1 Naming Style]
* [Fix] fix few delete method name
---
.../console/core/controller/AlertController.java | 2 +-
.../console/core/controller/ApplicationController.java | 8 ++++----
.../console/core/controller/ExternalLinkController.java | 2 +-
.../console/core/controller/FlinkClusterController.java | 2 +-
.../console/core/controller/FlinkEnvController.java | 2 +-
.../console/core/controller/ProjectController.java | 2 +-
.../console/core/controller/ResourceController.java | 2 +-
.../console/core/controller/SavePointController.java | 2 +-
.../console/core/controller/VariableController.java | 2 +-
.../console/core/controller/YarnQueueController.java | 2 +-
.../console/core/service/AppBuildPipeService.java | 2 +-
.../console/core/service/ApplicationBackUpService.java | 4 ++--
.../console/core/service/ApplicationConfigService.java | 2 +-
.../console/core/service/ApplicationLogService.java | 4 +---
.../console/core/service/EffectiveService.java | 4 ++--
.../console/core/service/ExternalLinkService.java | 2 +-
.../console/core/service/FlinkClusterService.java | 2 +-
.../streampark/console/core/service/FlinkEnvService.java | 2 +-
.../streampark/console/core/service/FlinkSqlService.java | 2 +-
.../streampark/console/core/service/ProjectService.java | 2 +-
.../streampark/console/core/service/ResourceService.java | 2 +-
.../console/core/service/SavePointService.java | 4 ++--
.../streampark/console/core/service/VariableService.java | 2 +-
.../console/core/service/YarnQueueService.java | 2 +-
.../console/core/service/alert/AlertConfigService.java | 2 +-
.../core/service/alert/impl/AlertConfigServiceImpl.java | 4 ++--
.../service/application/ApplicationManageService.java | 2 +-
.../application/impl/ApplicationManageServiceImpl.java | 16 ++++++++--------
.../core/service/impl/AppBuildPipeServiceImpl.java | 4 ++--
.../core/service/impl/ApplicationBackUpServiceImpl.java | 8 ++++----
.../core/service/impl/ApplicationConfigServiceImpl.java | 4 ++--
.../core/service/impl/ApplicationLogServiceImpl.java | 7 +------
.../console/core/service/impl/EffectiveServiceImpl.java | 4 ++--
.../core/service/impl/ExternalLinkServiceImpl.java | 2 +-
.../core/service/impl/FlinkClusterServiceImpl.java | 2 +-
.../console/core/service/impl/FlinkEnvServiceImpl.java | 2 +-
.../console/core/service/impl/FlinkSqlServiceImpl.java | 2 +-
.../console/core/service/impl/ProjectServiceImpl.java | 4 ++--
.../console/core/service/impl/ResourceServiceImpl.java | 2 +-
.../console/core/service/impl/SavePointServiceImpl.java | 4 ++--
.../console/core/service/impl/VariableServiceImpl.java | 2 +-
.../console/core/service/impl/YarnQueueServiceImpl.java | 2 +-
.../console/core/task/ApplicationBackUpCleanTask.java | 2 +-
43 files changed, 65 insertions(+), 72 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
index 66182a7a6..381206f13 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
@@ -108,7 +108,7 @@ public class AlertController {
@DeleteMapping("/delete")
public RestResponse deleteAlertConfig(
@RequestParam("id") @NotNull(message = "config id must be not null")
Long id) {
- boolean result = alertConfigService.deleteById(id);
+ boolean result = alertConfigService.removeById(id);
return RestResponse.success(result);
}
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 d8dd5d43c..788992e90 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
@@ -334,8 +334,8 @@ public class ApplicationController {
@PermissionAction(id = "#applicationLog.appId", type =
PermissionTypeEnum.APP)
@PostMapping("deleteOperationLog")
@RequiresPermissions("app:delete")
- public RestResponse deleteOperationLog(ApplicationLog applicationLog) {
- Boolean deleted = applicationLogService.delete(applicationLog);
+ public RestResponse deleteOperationLog(Long id) {
+ Boolean deleted = applicationLogService.removeById(id);
return RestResponse.success(deleted);
}
@@ -344,7 +344,7 @@ public class ApplicationController {
@PostMapping("delete")
@RequiresPermissions("app:delete")
public RestResponse delete(Application app) throws InternalException {
- Boolean deleted = applicationManageService.delete(app);
+ Boolean deleted = applicationManageService.remove(app);
return RestResponse.success(deleted);
}
@@ -352,7 +352,7 @@ public class ApplicationController {
@PermissionAction(id = "#backUp.appId", type = PermissionTypeEnum.APP)
@PostMapping("deletebak")
public RestResponse deleteBak(ApplicationBackUp backUp) throws
InternalException {
- Boolean deleted = backUpService.delete(backUp.getId());
+ Boolean deleted = backUpService.removeById(backUp.getId());
return RestResponse.success(deleted);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
index db1f8ec5c..a1c226077 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
@@ -93,7 +93,7 @@ public class ExternalLinkController {
@RequiresPermissions("externalLink:delete")
public RestResponse delete(
@NotNull(message = "The link id cannot be null") @RequestParam("id")
Long id) {
- externalLinkService.delete(id);
+ externalLinkService.removeById(id);
return RestResponse.success();
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
index a2b0048c2..d84eb74b1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
@@ -111,7 +111,7 @@ public class FlinkClusterController {
@Operation(summary = "Delete flink cluster")
@PostMapping("delete")
public RestResponse delete(FlinkCluster cluster) {
- flinkClusterService.delete(cluster);
+ flinkClusterService.remove(cluster);
return RestResponse.success();
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
index 0cde10904..9c3e8471a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
@@ -96,7 +96,7 @@ public class FlinkEnvController {
@Operation(summary = "Delete flink environment")
@PostMapping("delete")
public RestResponse delete(Long id) {
- flinkEnvService.delete(id);
+ flinkEnvService.removeById(id);
return RestResponse.success();
}
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 1c1ffff6e..7ccaea586 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
@@ -113,7 +113,7 @@ public class ProjectController {
@PostMapping("delete")
@RequiresPermissions("project:delete")
public RestResponse delete(Long id) {
- Boolean deleted = projectService.delete(id);
+ Boolean deleted = projectService.removeById(id);
return RestResponse.success().data(deleted);
}
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 1d640e289..9e2b53675 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
@@ -84,7 +84,7 @@ public class ResourceController {
@DeleteMapping("delete")
@RequiresPermissions("resource:delete")
public RestResponse deleteResource(@Valid Resource resource) {
- this.resourceService.deleteResource(resource);
+ this.resourceService.remove(resource);
return RestResponse.success();
}
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 0cab3d671..e228b838e 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
@@ -74,7 +74,7 @@ public class SavePointController {
public RestResponse delete(Long id) throws InternalException {
SavePoint savePoint = savePointService.getById(id);
Application application =
applicationManageService.getById(savePoint.getAppId());
- Boolean deleted = savePointService.delete(id, application);
+ Boolean deleted = savePointService.remove(id, application);
return RestResponse.success(deleted);
}
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 a662df521..68cc2d54c 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
@@ -123,7 +123,7 @@ public class VariableController {
@DeleteMapping("delete")
@RequiresPermissions("variable:delete")
public RestResponse deleteVariable(@Valid Variable variable) {
- this.variableService.deleteVariable(variable);
+ this.variableService.remove(variable);
return RestResponse.success();
}
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 3fc5b5d6e..853b504fe 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
@@ -90,7 +90,7 @@ public class YarnQueueController {
@PostMapping("delete")
@RequiresPermissions("yarnQueue:delete")
public RestResponse delete(YarnQueue yarnQueue) {
- yarnQueueService.deleteYarnQueue(yarnQueue);
+ yarnQueueService.remove(yarnQueue);
return RestResponse.success();
}
}
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 a0ee7d0ab..f6fa3fd2b 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
@@ -62,5 +62,5 @@ public interface AppBuildPipeService extends
IService<AppBuildPipeline> {
*
* @param appId
*/
- void removeApp(Long appId);
+ void removeByAppId(Long appId);
}
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 5f8df46e5..ae498d3d7 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
@@ -36,7 +36,7 @@ public interface ApplicationBackUpService extends
IService<ApplicationBackUp> {
* @return true if the object was successfully deleted, false otherwise.
* @throws InternalException if an internal error occurs during the deletion
process.
*/
- Boolean delete(Long id) throws InternalException;
+ Boolean removeById(Long id) throws InternalException;
/**
* Performs a backup for the given application and Flink SQL parameters.
@@ -74,7 +74,7 @@ public interface ApplicationBackUpService extends
IService<ApplicationBackUp> {
*
* @param appParam the application to be removed
*/
- void removeApp(Application appParam);
+ void remove(Application appParam);
/**
* Rolls back a Flink SQL application to its previous state.
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 f8ff1d416..1c8485210 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
@@ -122,5 +122,5 @@ public interface ApplicationConfigService extends
IService<ApplicationConfig> {
*
* @param appId The id of the app to be removed.
*/
- void removeApp(Long appId);
+ void removeByAppId(Long appId);
}
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 36f51afd5..b39d16c2c 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
@@ -27,7 +27,5 @@ public interface ApplicationLogService extends
IService<ApplicationLog> {
IPage<ApplicationLog> getPage(ApplicationLog applicationLog, RestRequest
request);
- void removeApp(Long appId);
-
- Boolean delete(ApplicationLog applicationLog);
+ void removeByAppId(Long appId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/EffectiveService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/EffectiveService.java
index 7488be867..4821f9e9b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/EffectiveService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/EffectiveService.java
@@ -24,11 +24,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface EffectiveService extends IService<Effective> {
- void delete(Long appId, EffectiveTypeEnum config);
+ void remove(Long appId, EffectiveTypeEnum config);
Effective get(Long appId, EffectiveTypeEnum config);
void saveOrUpdate(Long appId, EffectiveTypeEnum type, Long id);
- void removeApp(Long appId);
+ void removeByAppId(Long appId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ExternalLinkService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ExternalLinkService.java
index 7605dc8fa..d33e93295 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ExternalLinkService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ExternalLinkService.java
@@ -27,7 +27,7 @@ public interface ExternalLinkService extends
IService<ExternalLink> {
void create(ExternalLink externalLink);
- void delete(Long linkId);
+ void removeById(Long linkId);
void update(ExternalLink externalLink);
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 e994c5aac..da3947c27 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
@@ -33,7 +33,7 @@ public interface FlinkClusterService extends
IService<FlinkCluster> {
Boolean create(FlinkCluster flinkCluster);
- void delete(FlinkCluster flinkCluster);
+ void remove(FlinkCluster flinkCluster);
void update(FlinkCluster flinkCluster);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
index f47e53c95..4a0b9bdd2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
@@ -49,7 +49,7 @@ public interface FlinkEnvService extends IService<FlinkEnv> {
*
* @param id the ID of the Flink environment to delete
*/
- void delete(Long id);
+ void removeById(Long id);
/**
* Updates the specified version of Flink environment.
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 9c8029464..c310bf3e7 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
@@ -46,7 +46,7 @@ public interface FlinkSqlService extends IService<FlinkSql> {
void cleanCandidate(Long id);
- void removeApp(Long appId);
+ void removeByAppId(Long appId);
void rollback(Application application);
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 7fc13cf25..2f7ea6ef1 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
@@ -34,7 +34,7 @@ public interface ProjectService extends IService<Project> {
boolean update(Project projectParam);
- boolean delete(Long id);
+ boolean removeById(Long id);
IPage<Project> getPage(Project project, RestRequest restRequest);
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 d6efe5076..22f33c243 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
@@ -73,7 +73,7 @@ public interface ResourceService extends IService<Resource> {
*
* @param resource
*/
- void deleteResource(Resource resource);
+ void remove(Resource resource);
/**
* Get resource through team 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 ff7090adb..8744b5f39 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
@@ -62,7 +62,7 @@ public interface SavePointService extends IService<SavePoint>
{
* @return true if the application is successfully deleted, false otherwise
* @throws InternalException if there is an internal error during the
deletion process
*/
- Boolean delete(Long id, Application appParam) throws InternalException;
+ Boolean remove(Long id, Application appParam) throws InternalException;
/**
* Retrieves a page of savepoint objects based on the specified parameters.
@@ -78,7 +78,7 @@ public interface SavePointService extends IService<SavePoint>
{
*
* @param appParam the application to be removed
*/
- void removeApp(Application appParam);
+ void remove(Application appParam);
/**
* Returns the savepoint path for the given 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 bd98979bf..effcedb00 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
@@ -75,7 +75,7 @@ public interface VariableService extends IService<Variable> {
*
* @param variable the Variable object to be deleted
*/
- void deleteVariable(Variable variable);
+ void remove(Variable variable);
/**
* Find a Variable by its code and team ID.
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 61e723a8d..19898ee83 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
@@ -35,7 +35,7 @@ public interface YarnQueueService extends IService<YarnQueue>
{
void updateYarnQueue(YarnQueue yarnQueue);
- void deleteYarnQueue(YarnQueue yarnQueue);
+ void remove(YarnQueue yarnQueue);
void checkQueueLabel(FlinkExecutionMode executionModeEnum, String
queueLabel);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
index 3ee0cdb9c..6da414fb7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
@@ -30,5 +30,5 @@ public interface AlertConfigService extends
IService<AlertConfig> {
boolean exist(AlertConfig alertConfig);
- boolean deleteById(Long id) throws AlertException;
+ boolean removeById(Long id) throws AlertException;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
index 828a89eeb..f77985ea7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
@@ -74,7 +74,7 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
}
@Override
- public boolean deleteById(Long id) throws AlertException {
+ public boolean removeById(Long id) throws AlertException {
long count =
applicationInfoService.count(
new LambdaQueryWrapper<Application>().eq(id != null,
Application::getAlertId, id));
@@ -84,6 +84,6 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
"AlertId:%d, this is bound by application. Please clear the
configuration first",
id));
}
- return removeById(id);
+ return super.removeById(id);
}
}
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 b21462763..4c111cc76 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
@@ -105,7 +105,7 @@ public interface ApplicationManageService extends
IService<Application> {
* @param appParam The Application to be deleted.
* @return True if the deletion was successful, false otherwise.
*/
- Boolean delete(Application appParam);
+ Boolean remove(Application appParam);
/**
* Retrieves the Application with the specified details from the system.
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 346a2f121..8c5bce437 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
@@ -175,31 +175,31 @@ public class ApplicationManageServiceImpl extends
ServiceImpl<ApplicationMapper,
}
@Override
- public Boolean delete(Application appParam) {
+ public Boolean remove(Application appParam) {
Application application = getById(appParam.getId());
// 1) remove flink sql
- flinkSqlService.removeApp(application.getId());
+ flinkSqlService.removeByAppId(application.getId());
// 2) remove log
- applicationLogService.removeApp(application.getId());
+ applicationLogService.removeByAppId(application.getId());
// 3) remove config
- configService.removeApp(application.getId());
+ configService.removeByAppId(application.getId());
// 4) remove effective
- effectiveService.removeApp(application.getId());
+ effectiveService.removeByAppId(application.getId());
// remove related hdfs
// 5) remove backup
- backUpService.removeApp(application);
+ backUpService.remove(application);
// 6) remove savepoint
- savePointService.removeApp(application);
+ savePointService.remove(application);
// 7) remove BuildPipeline
- appBuildPipeService.removeApp(application.getId());
+ appBuildPipeService.removeByAppId(application.getId());
// 8) remove app
removeApp(application);
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 fdb45c993..c04829104 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
@@ -215,7 +215,7 @@ public class AppBuildPipeServiceImpl
BuildPipeline pipeline = createPipelineInstance(app);
// clear history
- removeApp(app.getId());
+ removeByAppId(app.getId());
// register pipeline progress event watcher.
// save snapshot of pipeline to db when status of pipeline was changed.
pipeline.registerWatcher(
@@ -593,7 +593,7 @@ public class AppBuildPipeServiceImpl
}
@Override
- public void removeApp(Long appId) {
+ public void removeByAppId(Long appId) {
baseMapper.delete(
new
LambdaQueryWrapper<AppBuildPipeline>().eq(AppBuildPipeline::getAppId, appId));
}
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 10efb6a97..b2b02a6a4 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
@@ -140,12 +140,12 @@ public class ApplicationBackUpServiceImpl
ApplicationBackUp backup = backUpPages.getRecords().get(0);
String path = backup.getPath();
appParam.getFsOperator().move(path,
appParam.getWorkspace().APP_WORKSPACE());
- removeById(backup.getId());
+ super.removeById(backup.getId());
}
}
@Override
- public void removeApp(Application appParam) {
+ public void remove(Application appParam) {
try {
baseMapper.delete(
new LambdaQueryWrapper<ApplicationBackUp>()
@@ -178,12 +178,12 @@ public class ApplicationBackUpServiceImpl
}
@Override
- public Boolean delete(Long id) throws InternalException {
+ public Boolean removeById(Long id) throws InternalException {
ApplicationBackUp backUp = getById(id);
try {
Application application =
applicationManageService.getById(backUp.getAppId());
application.getFsOperator().delete(backUp.getPath());
- removeById(id);
+ super.removeById(id);
return true;
} catch (Exception e) {
throw new InternalException(e.getMessage());
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 efd632c63..8d86d1c03 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
@@ -107,7 +107,7 @@ public class ApplicationConfigServiceImpl
ApplicationConfig effectiveConfig = getEffective(appParam.getId());
if (Utils.isEmpty(appParam.getConfig())) {
if (effectiveConfig != null) {
- effectiveService.delete(appParam.getId(), EffectiveTypeEnum.CONFIG);
+ effectiveService.remove(appParam.getId(), EffectiveTypeEnum.CONFIG);
}
} else {
// there was no configuration before, is a new configuration
@@ -245,7 +245,7 @@ public class ApplicationConfigServiceImpl
}
@Override
- public void removeApp(Long appId) {
+ public void removeByAppId(Long appId) {
baseMapper.delete(
new
LambdaQueryWrapper<ApplicationConfig>().eq(ApplicationConfig::getAppId, appId));
}
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 83e4f69d6..fd391386d 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
@@ -50,14 +50,9 @@ public class ApplicationLogServiceImpl extends
ServiceImpl<ApplicationLogMapper,
}
@Override
- public void removeApp(Long appId) {
+ public void removeByAppId(Long appId) {
LambdaQueryWrapper<ApplicationLog> queryWrapper =
new LambdaQueryWrapper<ApplicationLog>().eq(ApplicationLog::getAppId,
appId);
this.remove(queryWrapper);
}
-
- @Override
- public Boolean delete(ApplicationLog applicationLog) {
- return removeById(applicationLog.getId());
- }
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/EffectiveServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/EffectiveServiceImpl.java
index 12afa4ec8..ae38b294b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/EffectiveServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/EffectiveServiceImpl.java
@@ -39,7 +39,7 @@ public class EffectiveServiceImpl extends
ServiceImpl<EffectiveMapper, Effective
implements EffectiveService {
@Override
- public void delete(Long appId, EffectiveTypeEnum effectiveTypeEnum) {
+ public void remove(Long appId, EffectiveTypeEnum effectiveTypeEnum) {
LambdaQueryWrapper<Effective> queryWrapper =
new LambdaQueryWrapper<Effective>()
.eq(Effective::getAppId, appId)
@@ -80,7 +80,7 @@ public class EffectiveServiceImpl extends
ServiceImpl<EffectiveMapper, Effective
}
@Override
- public void removeApp(Long appId) {
+ public void removeByAppId(Long appId) {
LambdaQueryWrapper<Effective> queryWrapper =
new LambdaQueryWrapper<Effective>().eq(Effective::getAppId, appId);
this.remove(queryWrapper);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
index 170b5a859..bb9219c7c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
@@ -69,7 +69,7 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
}
@Override
- public void delete(Long linkId) {
+ public void removeById(Long linkId) {
baseMapper.deleteById(linkId);
}
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 4473f77a3..149dde4b5 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
@@ -342,7 +342,7 @@ public class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
}
@Override
- public void delete(FlinkCluster cluster) {
+ public void remove(FlinkCluster cluster) {
Long id = cluster.getId();
FlinkCluster flinkCluster = getById(id);
ApiAlertException.throwIfNull(flinkCluster, "Flink cluster not exist,
please check.");
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
index e42432886..1883c36a5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
@@ -89,7 +89,7 @@ public class FlinkEnvServiceImpl extends
ServiceImpl<FlinkEnvMapper, FlinkEnv>
}
@Override
- public void delete(Long id) {
+ public void removeById(Long id) {
FlinkEnv flinkEnv = getById(id);
checkOrElseAlert(flinkEnv);
Long count = this.baseMapper.selectCount(null);
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 5f8ce2584..1ac67162d 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
@@ -163,7 +163,7 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
}
@Override
- public void removeApp(Long appId) {
+ public void removeByAppId(Long appId) {
LambdaQueryWrapper<FlinkSql> queryWrapper =
new LambdaQueryWrapper<FlinkSql>().eq(FlinkSql::getAppId, appId);
baseMapper.delete(queryWrapper);
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 7d8ded31f..5360ff78a 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
@@ -158,7 +158,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
}
@Override
- public boolean delete(Long id) {
+ public boolean removeById(Long id) {
Project project = getById(id);
Utils.notNull(project);
LambdaQueryWrapper<Application> queryWrapper =
@@ -169,7 +169,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
}
try {
project.delete();
- removeById(id);
+ super.removeById(id);
return true;
} catch (IOException e) {
return false;
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 7f04df604..b89e57a9a 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
@@ -203,7 +203,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
}
@Override
- public void deleteResource(Resource resource) {
+ public void remove(Resource resource) {
Resource findResource = getById(resource.getId());
checkOrElseAlert(findResource);
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 748c8d251..608ab0280 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
@@ -199,7 +199,7 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
}
@Override
- public Boolean delete(Long id, Application appParam) throws
InternalException {
+ public Boolean remove(Long id, Application appParam) throws
InternalException {
SavePoint savePoint = getById(id);
try {
if (StringUtils.isNotEmpty(savePoint.getPath())) {
@@ -221,7 +221,7 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
}
@Override
- public void removeApp(Application appParam) {
+ public void remove(Application appParam) {
Long appId = appParam.getId();
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 84411ea70..68c35a88a 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
@@ -83,7 +83,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
}
@Override
- public void deleteVariable(Variable variable) {
+ public void remove(Variable variable) {
ApiAlertException.throwIfTrue(
isDependByApplications(variable), "Sorry, the variable is actually
used.");
this.removeById(variable);
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 9958e3ecd..9cecfb4df 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
@@ -157,7 +157,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
}
@Override
- public void deleteYarnQueue(YarnQueue yarnQueue) {
+ public void remove(YarnQueue yarnQueue) {
YarnQueue queueFromDB = getYarnQueueByIdWithPreconditions(yarnQueue);
checkNotReferencedByApplications(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java
index e1a7056b2..7695f5366 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java
@@ -52,7 +52,7 @@ public class ApplicationBackUpCleanTask {
.forEach(
backUp -> {
try {
- backUpService.delete(backUp.getId());
+ backUpService.removeById(backUp.getId());
} catch (Exception e) {
log.error(
"Clean application backup failed for app id: {}
, backup id: {}",
