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 d27c14d46 [Improve] Improve streampark-console system package module
service remove method name base on [3.1 Naming Style] (#3335)
d27c14d46 is described below
commit d27c14d4613483ff1342eeba886f33561c9f4618
Author: VampireAchao <[email protected]>
AuthorDate: Sat Nov 11 16:19:47 2023 +0800
[Improve] Improve streampark-console system package module service remove
method name base on [3.1 Naming Style] (#3335)
* [Improve] Improve streampark-console system package module service remove
method name base on [3.1 Naming Style]
* [Fix] Fix remove method name
---
.../console/system/controller/AccessTokenController.java | 2 +-
.../streampark/console/system/controller/MemberController.java | 2 +-
.../streampark/console/system/controller/RoleController.java | 2 +-
.../streampark/console/system/controller/TeamController.java | 2 +-
.../streampark/console/system/service/AccessTokenService.java | 2 --
.../apache/streampark/console/system/service/MemberService.java | 8 ++++----
.../apache/streampark/console/system/service/RoleMenuServie.java | 4 ++--
.../org/apache/streampark/console/system/service/RoleService.java | 2 +-
.../org/apache/streampark/console/system/service/TeamService.java | 2 +-
.../console/system/service/impl/AccessTokenServiceImpl.java | 5 -----
.../streampark/console/system/service/impl/MemberServiceImpl.java | 8 ++++----
.../console/system/service/impl/RoleMenuServiceImpl.java | 4 ++--
.../streampark/console/system/service/impl/RoleServiceImpl.java | 6 +++---
.../streampark/console/system/service/impl/TeamServiceImpl.java | 6 +++---
.../streampark/console/core/service/AccessTokenServiceTest.java | 2 +-
15 files changed, 25 insertions(+), 32 deletions(-)
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 446a3a8af..ae723b141 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
@@ -150,7 +150,7 @@ public class AccessTokenController {
@DeleteMapping(value = "delete")
@RequiresPermissions("token:delete")
public RestResponse deleteToken(@NotBlank(message = "{required}") Long
tokenId) {
- boolean res = accessTokenService.deleteToken(tokenId);
+ boolean res = accessTokenService.removeById(tokenId);
return RestResponse.success(res);
}
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 6e7a3efe4..b9feac9bd 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
@@ -96,7 +96,7 @@ public class MemberController {
@DeleteMapping("delete")
@RequiresPermissions("member:delete")
public RestResponse delete(Member member) {
- this.memberService.deleteMember(member);
+ this.memberService.remove(member);
return RestResponse.success();
}
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 e87ec81ce..4a8b71067 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
@@ -92,7 +92,7 @@ public class RoleController {
@DeleteMapping("delete")
@RequiresPermissions("role:delete")
public RestResponse deleteRole(Long roleId) {
- this.roleService.deleteRole(roleId);
+ this.roleService.removeById(roleId);
return RestResponse.success();
}
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 49d6569e1..431e2d40f 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
@@ -74,7 +74,7 @@ public class TeamController {
@DeleteMapping("delete")
@RequiresPermissions("team:delete")
public RestResponse deleteTeam(Team team) {
- this.teamService.deleteTeam(team.getId());
+ this.teamService.removeById(team.getId());
return RestResponse.success();
}
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 b264e36c2..27484b62b 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
@@ -30,8 +30,6 @@ public interface AccessTokenService extends
IService<AccessToken> {
RestResponse generateToken(Long userId, String expireTime, String
description)
throws InternalException;
- boolean deleteToken(Long id);
-
IPage<AccessToken> getPage(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 5a5245093..b92294365 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
@@ -29,11 +29,11 @@ import java.util.List;
public interface MemberService extends IService<Member> {
- void deleteByRoleIds(String[] roleIds);
+ void removeByRoleIds(String[] roleIds);
- void deleteByUserId(Long userId);
+ void removeByUserId(Long userId);
- void deleteByTeamId(Long teamId);
+ void removeByTeamId(Long teamId);
IPage<Member> getPage(Member member, RestRequest request);
@@ -47,7 +47,7 @@ public interface MemberService extends IService<Member> {
void createMember(Member member);
- void deleteMember(Member member);
+ void remove(Member member);
void updateMember(Member member);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
index 957dd0503..6926faefe 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
@@ -25,9 +25,9 @@ import java.util.List;
public interface RoleMenuServie extends IService<RoleMenu> {
- void deleteByRoleId(Long roleId);
+ void removeByRoleId(Long roleId);
- void deleteByMenuId(String[] menuIds);
+ void removeByMenuIds(String[] menuIds);
List<RoleMenu> listByRoleId(String roleId);
}
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 0cbc63004..608251578 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
@@ -31,7 +31,7 @@ public interface RoleService extends IService<Role> {
void createRole(Role role);
- void deleteRole(Long roleId);
+ void removeById(Long roleId);
void updateRole(Role role);
}
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 a4903d0ef..ee494e62b 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
@@ -33,7 +33,7 @@ public interface TeamService extends IService<Team> {
void createTeam(Team team);
- void deleteTeam(Long teamId);
+ void removeById(Long teamId);
void updateTeam(Team team);
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 df86ffee7..4adc4544e 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
@@ -81,11 +81,6 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
return RestResponse.success().data(accessToken);
}
- @Override
- public boolean deleteToken(Long id) {
- return this.removeById(id);
- }
-
@Override
public IPage<AccessToken> getPage(AccessToken tokenParam, RestRequest
request) {
Page<AccessToken> page = new
MybatisPager<AccessToken>().getDefaultPage(request);
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 086fd9dc3..e776beb34 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
@@ -56,18 +56,18 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
@Override
@Transactional
- public void deleteByRoleIds(String[] roleIds) {
+ public void removeByRoleIds(String[] roleIds) {
Arrays.stream(roleIds).forEach(id ->
baseMapper.deleteByRoleId(Long.valueOf(id)));
}
@Override
@Transactional
- public void deleteByUserId(Long userId) {
+ public void removeByUserId(Long userId) {
baseMapper.deleteByUserId(userId);
}
@Override
- public void deleteByTeamId(Long teamId) {
+ public void removeByTeamId(Long teamId) {
LambdaQueryWrapper<Member> queryWrapper =
new LambdaQueryWrapper<Member>().eq(Member::getTeamId, teamId);
this.remove(queryWrapper);
@@ -151,7 +151,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
}
@Override
- public void deleteMember(Member memberArg) {
+ public void remove(Member memberArg) {
Member member =
Optional.ofNullable(this.getById(memberArg.getId()))
.orElseThrow(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
index c35f1369b..5fd80c96f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
@@ -37,7 +37,7 @@ public class RoleMenuServiceImpl extends
ServiceImpl<RoleMenuMapper, RoleMenu>
@Override
@Transactional
- public void deleteByRoleId(Long roleId) {
+ public void removeByRoleId(Long roleId) {
LambdaQueryWrapper<RoleMenu> queryWrapper =
new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId);
baseMapper.delete(queryWrapper);
@@ -45,7 +45,7 @@ public class RoleMenuServiceImpl extends
ServiceImpl<RoleMenuMapper, RoleMenu>
@Override
@Transactional
- public void deleteByMenuId(String[] menuIds) {
+ public void removeByMenuIds(String[] menuIds) {
List<String> list = Arrays.asList(menuIds);
LambdaQueryWrapper<RoleMenu> queryWrapper =
new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, list);
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 244cf6acb..57ba2be77 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
@@ -81,7 +81,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
}
@Override
- public void deleteRole(Long roleId) {
+ public void removeById(Long roleId) {
Role role =
Optional.ofNullable(this.getById(roleId))
.orElseThrow(
@@ -94,8 +94,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
String.format(
"There are some users of role %s, delete role failed, please
unbind it first.",
role.getRoleName()));
- this.removeById(roleId);
- this.roleMenuService.deleteByRoleId(roleId);
+ super.removeById(roleId);
+ this.roleMenuService.removeByRoleId(roleId);
}
@Override
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 3d0bb708e..8ae8717ac 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
@@ -92,7 +92,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
}
@Override
- public void deleteTeam(Long teamId) {
+ public void removeById(Long teamId) {
log.info("{} Proceed delete team[Id={}]",
commonService.getCurrentUser().getUsername(), teamId);
Team team = this.getById(teamId);
@@ -113,9 +113,9 @@ public class TeamServiceImpl extends
ServiceImpl<TeamMapper, Team> implements Te
String.format(
"Please delete the variables under the team[name=%s] first!",
team.getTeamName()));
- memberService.deleteByTeamId(teamId);
+ memberService.removeByTeamId(teamId);
userService.clearLastTeam(teamId);
- this.removeById(teamId);
+ super.removeById(teamId);
}
@Override
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 4520ad47d..8d8efed20 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
@@ -81,6 +81,6 @@ public class AccessTokenServiceTest extends
SpringUnitTestBase {
Assertions.assertEquals(AccessToken.STATUS_DISABLE,
afterToggle.getStatus());
// delete
- Assertions.assertTrue(accessTokenService.deleteToken(tokenId));
+ Assertions.assertTrue(accessTokenService.removeById(tokenId));
}
}
