This is an automated email from the ASF dual-hosted git repository.
panyuepeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 6e98f4c56 [ISSUE-3064][Improve] Improve streampark-console list
variable name base on [3.1 Naming Style] (#3354)
6e98f4c56 is described below
commit 6e98f4c5618850ef6cf82a938c5b3f395e583c49
Author: VampireAchao <[email protected]>
AuthorDate: Fri Nov 24 19:29:13 2023 +0800
[ISSUE-3064][Improve] Improve streampark-console list variable name base on
[3.1 Naming Style] (#3354)
---
.../apache/streampark/console/base/util/VueRouterUtils.java | 6 +++---
.../console/core/controller/FlinkEnvController.java | 4 ++--
.../console/core/controller/ProjectController.java | 8 ++++----
.../console/core/service/impl/ProjectServiceImpl.java | 12 ++++++------
.../streampark/console/system/controller/RoleController.java | 8 ++++----
.../console/system/service/impl/MemberServiceImpl.java | 4 ++--
.../console/system/service/impl/RoleMenuServiceImpl.java | 4 ++--
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/VueRouterUtils.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/VueRouterUtils.java
index 4b60a2308..94c9a3a90 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/VueRouterUtils.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/VueRouterUtils.java
@@ -110,14 +110,14 @@ public final class VueRouterUtils {
}
});
- List<VueRouter<T>> list = new ArrayList<>();
+ List<VueRouter<T>> routerList = new ArrayList<>();
VueRouter<T> root = new VueRouter<>();
root.setName("Root");
root.setComponent("BasicView");
root.setPath("/");
root.setChildren(topRoutes);
- list.add(root);
+ routerList.add(root);
- return list;
+ return routerList;
}
}
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 9c3e8471a..1c0e79468 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
@@ -45,8 +45,8 @@ public class FlinkEnvController {
@Operation(summary = "Get flink environment")
@PostMapping("list")
public RestResponse list() {
- List<FlinkEnv> list = flinkEnvService.list();
- return RestResponse.success(list);
+ List<FlinkEnv> flinkEnvList = flinkEnvService.list();
+ return RestResponse.success(flinkEnvList);
}
@Operation(summary = "Verify flink environment")
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 7ccaea586..09dc17ab6 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
@@ -148,14 +148,14 @@ public class ProjectController {
@Operation(summary = "List project configurations")
@PostMapping("listconf")
public RestResponse listConf(Project project) {
- List<Map<String, Object>> list = projectService.listConf(project);
- return RestResponse.success().data(list);
+ List<Map<String, Object>> confList = projectService.listConf(project);
+ return RestResponse.success().data(confList);
}
@Operation(summary = "List the team projects")
@PostMapping("select")
public RestResponse select(@RequestParam Long teamId) {
- List<Project> list = projectService.listByTeamId(teamId);
- return RestResponse.success().data(list);
+ List<Project> projectList = projectService.listByTeamId(teamId);
+ return RestResponse.success().data(projectList);
}
}
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 5360ff78a..f434ef946 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
@@ -247,16 +247,16 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
@Override
public List<String> jars(Project project) {
- List<String> list = new ArrayList<>(0);
+ List<String> jarList = new ArrayList<>(0);
ApiAlertException.throwIfNull(
project.getModule(), "Project module can't be null, please check.");
File apps = new File(project.getDistHome(), project.getModule());
for (File file : Objects.requireNonNull(apps.listFiles())) {
if (file.getName().endsWith(Constant.JAR_SUFFIX)) {
- list.add(file.getName());
+ jarList.add(file.getName());
}
}
- return list;
+ return jarList;
}
@Override
@@ -296,13 +296,13 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
if (!unzipFile.exists()) {
GZipUtils.deCompress(file.getAbsolutePath(),
file.getParentFile().getAbsolutePath());
}
- List<Map<String, Object>> list = new ArrayList<>();
+ List<Map<String, Object>> confList = new ArrayList<>();
File[] files = unzipFile.listFiles(x -> "conf".equals(x.getName()));
Utils.notNull(files);
for (File item : files) {
- eachFile(item, list, true);
+ eachFile(item, confList, true);
}
- return list;
+ return confList;
} catch (Exception e) {
log.info(e.getMessage());
}
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 4a8b71067..57a14c3c4 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
@@ -72,12 +72,12 @@ public class RoleController {
@Operation(summary = "List role menus")
@PostMapping("menu")
public RestResponse getRoleMenus(@NotBlank(message = "{required}") String
roleId) {
- List<RoleMenu> list = this.roleMenuServie.listByRoleId(roleId);
- List<String> roleMenus =
- list.stream()
+ List<RoleMenu> roleMenuList = this.roleMenuServie.listByRoleId(roleId);
+ List<String> menuIdList =
+ roleMenuList.stream()
.map(roleMenu -> String.valueOf(roleMenu.getMenuId()))
.collect(Collectors.toList());
- return RestResponse.success(roleMenus);
+ return RestResponse.success(menuIdList);
}
@Operation(summary = "Create role")
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 e776beb34..7b64e572c 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
@@ -114,8 +114,8 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
public List<Long> listUserIdsByRoleId(Long roleId) {
LambdaQueryWrapper<Member> queryWrapper =
new LambdaQueryWrapper<Member>().eq(Member::getRoleId, roleId);
- List<Member> list = baseMapper.selectList(queryWrapper);
- return list.stream().map(Member::getUserId).collect(Collectors.toList());
+ List<Member> memberList = baseMapper.selectList(queryWrapper);
+ return
memberList.stream().map(Member::getUserId).collect(Collectors.toList());
}
@Override
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 5fd80c96f..90f128d85 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
@@ -46,9 +46,9 @@ public class RoleMenuServiceImpl extends
ServiceImpl<RoleMenuMapper, RoleMenu>
@Override
@Transactional
public void removeByMenuIds(String[] menuIds) {
- List<String> list = Arrays.asList(menuIds);
+ List<String> menuIdList = Arrays.asList(menuIds);
LambdaQueryWrapper<RoleMenu> queryWrapper =
- new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, list);
+ new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, menuIdList);
baseMapper.delete(queryWrapper);
}
