diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java index 0858b18a11..d8dd5d43c1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java @@ -319,14 +319,14 @@ public RestResponse getMain(Application application) { @Operation(summary = "List application backups") @PostMapping("backups") public RestResponse backups(ApplicationBackUp backUp, RestRequest request) { - IPage backups = backUpService.page(backUp, request); + IPage backups = backUpService.getPage(backUp, request); return RestResponse.success(backups); } @Operation(summary = "List application operation logs") @PostMapping("optionlog") public RestResponse optionlog(ApplicationLog applicationLog, RestRequest request) { - IPage applicationList = applicationLogService.page(applicationLog, request); + IPage applicationList = applicationLogService.getPage(applicationLog, request); return RestResponse.success(applicationList); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java index abe848d08d..376cf9ea65 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java @@ -66,7 +66,7 @@ public RestResponse template() { @Operation(summary = "List the application configs") @PostMapping("list") public RestResponse list(ApplicationConfig config, RestRequest request) { - IPage page = applicationConfigService.page(config, request); + IPage page = applicationConfigService.getPage(config, request); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java index 6e92cea063..2de639c510 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java @@ -90,7 +90,7 @@ public RestResponse verify(String sql, Long versionId, Long teamId) { @Operation(summary = "List the application sql") @PostMapping("list") public RestResponse list(Long appId, RestRequest request) { - IPage page = flinkSqlService.page(appId, request); + IPage page = flinkSqlService.getPage(appId, request); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java index 7fc544c4de..e0bfaf28b7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java @@ -46,7 +46,7 @@ public class MessageController { @PostMapping("notice") public RestResponse notice(Integer type, RestRequest request) { NoticeTypeEnum noticeTypeEnum = NoticeTypeEnum.of(type); - IPage pages = messageService.getUnRead(noticeTypeEnum, request); + IPage pages = messageService.getUnReadPage(noticeTypeEnum, request); return RestResponse.success(pages); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java index deac916742..1c1ffff6e5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java @@ -98,7 +98,7 @@ public RestResponse list(Project project, RestRequest restRequest) { if (project.getTeamId() == null) { return RestResponse.success(Collections.emptyList()); } - IPage page = projectService.page(project, restRequest); + IPage page = projectService.getPage(project, restRequest); return RestResponse.success().data(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java index 25b5f9eb60..1d640e2895 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ResourceController.java @@ -68,7 +68,7 @@ public RestResponse checkResource(@Valid Resource resource) throws Exception { @Operation(summary = "List resources") @PostMapping("page") public RestResponse page(RestRequest restRequest, Resource resource) { - IPage page = resourceService.page(resource, restRequest); + IPage page = resourceService.getPage(resource, restRequest); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java index e495473c1b..0cab3d6712 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java @@ -64,7 +64,7 @@ public RestResponse latest(Long appId) { @Operation(summary = "List application savepoint histories") @PostMapping("history") public RestResponse history(SavePoint savePoint, RestRequest request) { - IPage page = savePointService.page(savePoint, request); + IPage page = savePointService.getPage(savePoint, request); return RestResponse.success(page); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java index b698a83283..a662df521a 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java @@ -63,7 +63,7 @@ public class VariableController { @PostMapping("page") @RequiresPermissions("variable:view") public RestResponse page(RestRequest restRequest, Variable variable) { - IPage page = variableService.page(variable, restRequest); + IPage page = variableService.getPage(variable, restRequest); for (Variable v : page.getRecords()) { v.dataMasking(); } @@ -91,7 +91,7 @@ public RestResponse variableList(@RequestParam Long teamId, String keyword) { @PostMapping("dependApps") @RequiresPermissions("variable:depend_apps") public RestResponse dependApps(RestRequest restRequest, Variable variable) { - IPage dependApps = variableService.pageDependApps(variable, restRequest); + IPage dependApps = variableService.getDependAppsPage(variable, restRequest); return RestResponse.success(dependApps); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java index 9edead6dc6..3fc5b5d6ed 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java @@ -55,7 +55,7 @@ public class YarnQueueController { @ApiAccess @PostMapping("list") public RestResponse list(RestRequest restRequest, YarnQueue yarnQueue) { - IPage queuePage = yarnQueueService.page(yarnQueue, restRequest); + IPage queuePage = yarnQueueService.getPage(yarnQueue, restRequest); return RestResponse.success(queuePage); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java index e4eed3c1fc..5f8df46e57 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java @@ -53,7 +53,7 @@ public interface ApplicationBackUpService extends IService { * @param request The {@link RestRequest} object used for pagination and sorting. * @return An {@link IPage} containing the retrieved {@link ApplicationBackUp} objects. */ - IPage page(ApplicationBackUp bakParam, RestRequest request); + IPage getPage(ApplicationBackUp bakParam, RestRequest request); /** * Rolls back the changes made by the specified application backup. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java index 7d4293156e..f8ff1d416f 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationConfigService.java @@ -100,7 +100,7 @@ public interface ApplicationConfigService extends IService { * @return an IPage containing the ApplicationConfig objects that match the filter criteria * specified in the config object, limited by the settings in the request object */ - IPage page(ApplicationConfig config, RestRequest request); + IPage getPage(ApplicationConfig config, RestRequest request); /** * Retrieves the history of application configurations for a given application. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java index 62585e71d6..36f51afd51 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ApplicationLogService.java @@ -25,7 +25,7 @@ public interface ApplicationLogService extends IService { - IPage page(ApplicationLog applicationLog, RestRequest request); + IPage getPage(ApplicationLog applicationLog, RestRequest request); void removeApp(Long appId); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java index ffd19bc9b1..9c8029464f 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkSqlService.java @@ -54,5 +54,5 @@ public interface FlinkSqlService extends IService { List listByTeamId(Long teamId); - IPage page(Long appId, RestRequest request); + IPage getPage(Long appId, RestRequest request); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java index 0d33ff2ba1..569d4468e7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/MessageService.java @@ -28,5 +28,5 @@ public interface MessageService extends IService { void push(Message message); - IPage getUnRead(NoticeTypeEnum noticeTypeEnum, RestRequest request); + IPage getUnReadPage(NoticeTypeEnum noticeTypeEnum, RestRequest request); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java index 8fc9652380..b8189ac1d8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ProjectService.java @@ -36,7 +36,7 @@ public interface ProjectService extends IService { boolean delete(Long id); - IPage page(Project project, RestRequest restRequest); + IPage getPage(Project project, RestRequest restRequest); Boolean existsByTeamId(Long teamId); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java index 97bd2c37e8..d6efe50768 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/ResourceService.java @@ -37,7 +37,7 @@ public interface ResourceService extends IService { * @param restRequest queryRequest * @return IPage */ - IPage page(Resource resource, RestRequest restRequest); + IPage getPage(Resource resource, RestRequest restRequest); /** * check resource exists by user id diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java index 20e772934a..ff7090adb3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java @@ -71,7 +71,7 @@ public interface SavePointService extends IService { * @param request The RestRequest object containing additional request parameters. * @return An instance of IPage representing the page of SavePoint objects. */ - IPage page(SavePoint savePoint, RestRequest request); + IPage getPage(SavePoint savePoint, RestRequest request); /** * Removes all savepoints for the specified application. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java index 1b007cdd2a..bd98979bf8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/VariableService.java @@ -35,7 +35,7 @@ public interface VariableService extends IService { * @param restRequest The query request containing search filters and pagination options. * @return An IPage object containing the found Variable objects matching the search criteria. */ - IPage page(Variable variable, RestRequest restRequest); + IPage getPage(Variable variable, RestRequest restRequest); /** * Retrieves a list of variables based on the team ID. @@ -102,7 +102,7 @@ public interface VariableService extends IService { * @param request The REST request containing additional parameters for retrieving the page. * @return An instance of IPage containing the dependent applications. */ - IPage pageDependApps(Variable variable, RestRequest request); + IPage getDependAppsPage(Variable variable, RestRequest request); /** * Updates the given variable. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java index 056616f3a5..61e723a8d7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/YarnQueueService.java @@ -27,7 +27,7 @@ public interface YarnQueueService extends IService { - IPage page(YarnQueue yarnQueue, RestRequest restRequest); + IPage getPage(YarnQueue yarnQueue, RestRequest restRequest); ResponseResult checkYarnQueue(YarnQueue yarnQueue); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java index 72124b81d9..10efb6a97b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationBackUpServiceImpl.java @@ -62,7 +62,7 @@ public class ApplicationBackUpServiceImpl @Autowired private FlinkSqlService flinkSqlService; @Override - public IPage page(ApplicationBackUp bakParam, RestRequest request) { + public IPage getPage(ApplicationBackUp bakParam, RestRequest request) { Page page = new MybatisPager().getDefaultPage(request); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java index b4e47f7b38..efd632c63e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationConfigServiceImpl.java @@ -202,7 +202,7 @@ public ApplicationConfig get(Long id) { } @Override - public IPage page(ApplicationConfig config, RestRequest request) { + public IPage getPage(ApplicationConfig config, RestRequest request) { Page page = new MybatisPager().getPage(request, "version", Constant.ORDER_DESC); IPage configList = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java index 7155020b43..83e4f69d6d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationLogServiceImpl.java @@ -40,7 +40,7 @@ public class ApplicationLogServiceImpl extends ServiceImpl page(ApplicationLog applicationLog, RestRequest request) { + public IPage getPage(ApplicationLog applicationLog, RestRequest request) { Page page = new MybatisPager().getPage(request, "option_time", Constant.ORDER_DESC); LambdaQueryWrapper queryWrapper = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java index 3f8e4c20a3..5f8ce25843 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java @@ -215,7 +215,7 @@ public List listByTeamId(Long teamId) { } @Override - public IPage page(Long appId, RestRequest request) { + public IPage getPage(Long appId, RestRequest request) { Page page = new MybatisPager().getPage(request, "version", Constant.ORDER_DESC); LambdaQueryWrapper queryWrapper = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java index 128c625a58..c7d4d1587e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java @@ -47,7 +47,7 @@ public void push(Message message) { } @Override - public IPage getUnRead(NoticeTypeEnum noticeTypeEnum, RestRequest request) { + public IPage getUnReadPage(NoticeTypeEnum noticeTypeEnum, RestRequest request) { Page page = new MybatisPager().getDefaultPage(request); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index 5b421ca81c..f1fb4f67a5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java @@ -177,7 +177,7 @@ public boolean delete(Long id) { } @Override - public IPage page(Project project, RestRequest request) { + public IPage getPage(Project project, RestRequest request) { Page page = new MybatisPager().getDefaultPage(request); return this.baseMapper.selectPage(page, project); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java index 2394573b83..7f04df6040 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java @@ -99,7 +99,7 @@ public class ResourceServiceImpl extends ServiceImpl @Autowired private FlinkSqlService flinkSqlService; @Override - public IPage page(Resource resource, RestRequest restRequest) { + public IPage getPage(Resource resource, RestRequest restRequest) { if (resource.getTeamId() == null) { return null; } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java index 60babca273..748c8d2510 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java @@ -212,7 +212,7 @@ public Boolean delete(Long id, Application appParam) throws InternalException { } @Override - public IPage page(SavePoint savePoint, RestRequest request) { + public IPage getPage(SavePoint savePoint, RestRequest request) { Page page = new MybatisPager().getPage(request, "trigger_time", Constant.ORDER_DESC); LambdaQueryWrapper queryWrapper = diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java index bf757c4508..84411ea704 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java @@ -90,7 +90,7 @@ public void deleteVariable(Variable variable) { } @Override - public IPage page(Variable variable, RestRequest request) { + public IPage getPage(Variable variable, RestRequest request) { if (variable.getTeamId() == null) { return null; } @@ -99,7 +99,7 @@ public IPage page(Variable variable, RestRequest request) { } @Override - public IPage pageDependApps(Variable variable, RestRequest request) { + public IPage getDependAppsPage(Variable variable, RestRequest request) { List applications = getDependApplicationsByCode(variable); IPage page = new Page<>(); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java index 662e10f9fa..9958e3ecdf 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java @@ -71,7 +71,7 @@ public class YarnQueueServiceImpl extends ServiceImpl page(YarnQueue yarnQueue, RestRequest request) { + public IPage getPage(YarnQueue yarnQueue, RestRequest request) { Utils.notNull(yarnQueue, "Yarn queue query params mustn't be null."); Utils.notNull(yarnQueue.getTeamId(), "Team id of yarn queue query params mustn't be null."); Page page = new Page<>(); diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java index aab5ae40f9..2d2abe184e 100644 --- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java +++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/YarnQueueServiceTest.java @@ -87,7 +87,7 @@ void testFindYarnQueues() { RestRequest request = new RestRequest(); request.setPageSize(2); request.setPageNum(1); - IPage yarnQueues = yarnQueueService.page(queryParams, request); + IPage yarnQueues = yarnQueueService.getPage(queryParams, request); assertThat( yarnQueues.getRecords().stream() .map(YarnQueue::getQueueLabel) @@ -97,7 +97,7 @@ void testFindYarnQueues() { // Test for 1st page, size = 2, order by create time with queue_label queryParams.setQueueLabel("q3"); IPage yarnQueuesWithQueueLabelLikeQuery = - yarnQueueService.page(queryParams, request); + yarnQueueService.getPage(queryParams, request); assertThat( yarnQueuesWithQueueLabelLikeQuery.getRecords().stream() .map(YarnQueue::getQueueLabel)