This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 3321ab197 [Improve] jdbc query page method improvement
3321ab197 is described below
commit 3321ab197bc33743d38c72eb054427ce4d27094a
Author: benjobs <[email protected]>
AuthorDate: Mon Jan 1 08:27:25 2024 +0800
[Improve] jdbc query page method improvement
---
.../apache/streampark/console/base/mybatis/pager/MybatisPager.java | 2 +-
.../streampark/console/core/controller/YarnQueueController.java | 2 +-
.../org/apache/streampark/console/core/service/YarnQueueService.java | 2 +-
.../streampark/console/core/service/impl/YarnQueueServiceImpl.java | 2 +-
.../streampark/console/system/controller/AccessTokenController.java | 2 +-
.../apache/streampark/console/system/controller/MemberController.java | 2 +-
.../apache/streampark/console/system/controller/RoleController.java | 2 +-
.../apache/streampark/console/system/controller/TeamController.java | 2 +-
.../apache/streampark/console/system/controller/UserController.java | 2 +-
.../apache/streampark/console/system/service/AccessTokenService.java | 2 +-
.../org/apache/streampark/console/system/service/MemberService.java | 2 +-
.../org/apache/streampark/console/system/service/RoleService.java | 2 +-
.../org/apache/streampark/console/system/service/TeamService.java | 2 +-
.../org/apache/streampark/console/system/service/UserService.java | 2 +-
.../console/system/service/impl/AccessTokenServiceImpl.java | 2 +-
.../streampark/console/system/service/impl/MemberServiceImpl.java | 2 +-
.../streampark/console/system/service/impl/RoleServiceImpl.java | 2 +-
.../streampark/console/system/service/impl/TeamServiceImpl.java | 2 +-
.../streampark/console/system/service/impl/UserServiceImpl.java | 2 +-
.../streampark/console/core/service/AccessTokenServiceTest.java | 4 ++--
.../apache/streampark/console/core/service/YarnQueueServiceTest.java | 4 ++--
21 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
index 4685a9818..b5aa2b2ff 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
@@ -47,7 +47,7 @@ public final class MybatisPager {
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
- List<OrderItem> orderItems = new ArrayList<>(0);
+ List<OrderItem> orderItems = new ArrayList<>(2);
String sortField = WebUtils.camelToUnderscore(request.getSortField());
if (StringUtils.equalsIgnoreCase(request.getSortOrder(),
Constant.ORDER_DESC)) {
orderItems.add(OrderItem.desc(sortField));
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..9edead6dc 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.page(yarnQueue, restRequest);
return RestResponse.success(queuePage);
}
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 6f92456c4..87de04a32 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> page(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/impl/YarnQueueServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
index 485695826..cabde3de2 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
@@ -72,7 +72,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
@Autowired private FlinkClusterService flinkClusterService;
@Override
- public IPage<YarnQueue> findYarnQueues(YarnQueue yarnQueue, RestRequest
request) {
+ public IPage<YarnQueue> page(YarnQueue yarnQueue, RestRequest request) {
Utils.notNull(yarnQueue, "Yarn queue query params mustn't be null.");
Utils.notNull(yarnQueue.getTeamId(), "Team id of yarn queue query params
mustn't be null.");
Page<YarnQueue> page = MybatisPager.getPage(request);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
index 09dd0b55c..4bbc82ae2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
@@ -117,7 +117,7 @@ public class AccessTokenController {
@RequiresPermissions("token:view")
public RestResponse tokensList(
RestRequest restRequest, @Parameter(hidden = true) AccessToken
accessToken) {
- IPage<AccessToken> accessTokens =
accessTokenService.findAccessTokens(accessToken, restRequest);
+ IPage<AccessToken> accessTokens = accessTokenService.page(accessToken,
restRequest);
return RestResponse.success(accessTokens);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
index bcbfd2046..69f5a9c71 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
@@ -57,7 +57,7 @@ public class MemberController {
@Operation(summary = "List members")
@PostMapping("list")
public RestResponse memberList(RestRequest restRequest, Member member) {
- IPage<Member> userList = memberService.findUsers(member, restRequest);
+ IPage<Member> userList = memberService.page(member, restRequest);
return RestResponse.success(userList);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
index 7c639782d..85a5749d6 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
@@ -58,7 +58,7 @@ public class RoleController {
@PostMapping("list")
@RequiresPermissions("role:view")
public RestResponse roleList(RestRequest restRequest, Role role) {
- IPage<Role> roleList = roleService.findRoles(role, restRequest);
+ IPage<Role> roleList = roleService.page(role, restRequest);
return RestResponse.success(roleList);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
index 86736b9e6..1882d6d7b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
@@ -51,7 +51,7 @@ public class TeamController {
@Operation(summary = "List teams")
@PostMapping("list")
public RestResponse teamList(RestRequest restRequest, Team team) {
- IPage<Team> teamList = teamService.findTeams(team, restRequest);
+ IPage<Team> teamList = teamService.page(team, restRequest);
return RestResponse.success(teamList);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index 13fafed17..1dec3fc5b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -70,7 +70,7 @@ public class UserController {
value = {"user:view", "app:view"},
logical = Logical.OR)
public RestResponse userList(RestRequest restRequest, User user) {
- IPage<User> userList = userService.findUserDetail(user, restRequest);
+ IPage<User> userList = userService.page(user, restRequest);
return RestResponse.success(userList);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
index 1eaed5cc0..c2611ac6c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
@@ -32,7 +32,7 @@ public interface AccessTokenService extends
IService<AccessToken> {
boolean deleteToken(Long id);
- IPage<AccessToken> findAccessTokens(AccessToken tokenParam, RestRequest
request);
+ IPage<AccessToken> page(AccessToken tokenParam, RestRequest request);
boolean checkTokenEffective(Long userId, String token);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
index 34ff96ca0..d8f06cb5a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
@@ -35,7 +35,7 @@ public interface MemberService extends IService<Member> {
void deleteByTeamId(Long teamId);
- IPage<Member> findUsers(Member member, RestRequest request);
+ IPage<Member> page(Member member, RestRequest request);
List<User> findCandidateUsers(Long teamId);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
index 8e1fd216b..a509ced3a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface RoleService extends IService<Role> {
- IPage<Role> findRoles(Role role, RestRequest request);
+ IPage<Role> page(Role role, RestRequest request);
Role findByName(String roleName);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
index 212a9ee4a..73a6c1d7f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
@@ -27,7 +27,7 @@ import java.util.List;
public interface TeamService extends IService<Team> {
- IPage<Team> findTeams(Team team, RestRequest request);
+ IPage<Team> page(Team team, RestRequest request);
Team findByName(String teamName);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
index 686e31b86..c744cb806 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
@@ -47,7 +47,7 @@ public interface UserService extends IService<User> {
* @param restRequest queryRequest
* @return IPage
*/
- IPage<User> findUserDetail(User user, RestRequest restRequest);
+ IPage<User> page(User user, RestRequest restRequest);
/**
* update login time
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index 99dee4dfd..83bf64efe 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -87,7 +87,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
}
@Override
- public IPage<AccessToken> findAccessTokens(AccessToken tokenParam,
RestRequest request) {
+ public IPage<AccessToken> page(AccessToken tokenParam, RestRequest request) {
Page<AccessToken> page = MybatisPager.getPage(request);
this.baseMapper.page(page, tokenParam);
List<AccessToken> records = page.getRecords();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index 8a50e6c2f..0ec6a73e5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
@@ -75,7 +75,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
}
@Override
- public IPage<Member> findUsers(Member member, RestRequest request) {
+ public IPage<Member> page(Member member, RestRequest request) {
ApiAlertException.throwIfNull(member.getTeamId(), "The team id is
required.");
Page<Member> page = MybatisPager.getPage(request);
return baseMapper.findUsers(page, member);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index bc2c830a9..bc8459c05 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -59,7 +59,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Autowired private RoleMenuServie roleMenuService;
@Override
- public IPage<Role> findRoles(Role role, RestRequest request) {
+ public IPage<Role> page(Role role, RestRequest request) {
Page<Role> page = MybatisPager.getPage(request);
return this.baseMapper.findRole(page, role);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index eb4d3d66e..1361f303f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -64,7 +64,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Autowired private CommonService commonService;
@Override
- public IPage<Team> findTeams(Team team, RestRequest request) {
+ public IPage<Team> page(Team team, RestRequest request) {
Page<Team> page = MybatisPager.getPage(request);
return this.baseMapper.findTeam(page, team);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index a77c0563a..35cf49dd4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -70,7 +70,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
}
@Override
- public IPage<User> findUserDetail(User user, RestRequest request) {
+ public IPage<User> page(User user, RestRequest request) {
Page<User> page = MybatisPager.getPage(request);
IPage<User> resPage = this.baseMapper.findUserDetail(page, user);
Utils.notNull(resPage);
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
index 70b8768d0..cdcaa2341 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
@@ -62,11 +62,11 @@ public class AccessTokenServiceTest extends SpringTestBase {
// list
AccessToken mockToken1 = new AccessToken();
mockToken1.setUserId(100000L);
- IPage<AccessToken> tokens1 =
accessTokenService.findAccessTokens(mockToken1, new RestRequest());
+ IPage<AccessToken> tokens1 = accessTokenService.page(mockToken1, new
RestRequest());
Assertions.assertEquals(1, tokens1.getRecords().size());
AccessToken mockToken2 = new AccessToken();
mockToken2.setUserId(100001L);
- IPage<AccessToken> tokens2 =
accessTokenService.findAccessTokens(mockToken2, new RestRequest());
+ IPage<AccessToken> tokens2 = accessTokenService.page(mockToken2, new
RestRequest());
Assertions.assertTrue(tokens2.getRecords().isEmpty());
// toggle
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 9e1cbc789..7dca127f3 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
@@ -86,7 +86,7 @@ class YarnQueueServiceTest extends SpringTestBase {
request.setPageNum(1);
request.setSortField("create_time");
request.setSortOrder("desc");
- IPage<YarnQueue> yarnQueues = yarnQueueService.findYarnQueues(queryParams,
request);
+ IPage<YarnQueue> yarnQueues = yarnQueueService.page(queryParams, request);
assertThat(
yarnQueues.getRecords().stream()
.map(YarnQueue::getQueueLabel)
@@ -96,7 +96,7 @@ class YarnQueueServiceTest extends SpringTestBase {
// Test for 1st page, size = 2, order by create time with queue_label
queryParams.setQueueLabel("q3");
IPage<YarnQueue> yarnQueuesWithQueueLabelLikeQuery =
- yarnQueueService.findYarnQueues(queryParams, request);
+ yarnQueueService.page(queryParams, request);
assertThat(
yarnQueuesWithQueueLabelLikeQuery.getRecords().stream()
.map(YarnQueue::getQueueLabel)
