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 9c06a8694 [ISSUE-3064][Improve] Improve streampark-console map
variable name base on [3.1 Naming Style] (#3354) (#3363)
9c06a8694 is described below
commit 9c06a869493670f6ec1118eeb1ba3a0f6b357756
Author: VampireAchao <[email protected]>
AuthorDate: Thu Nov 30 13:42:24 2023 +0800
[ISSUE-3064][Improve] Improve streampark-console map variable name base on
[3.1 Naming Style] (#3354) (#3363)
---
.../core/controller/ApplicationController.java | 4 ++--
.../console/core/entity/Application.java | 12 +++++------
.../console/core/entity/FlinkCluster.java | 22 ++++++++++----------
.../console/core/enums/AlertTypeEnum.java | 6 +++---
.../impl/ApplicationInfoServiceImpl.java | 20 +++++++++---------
.../core/service/impl/ExternalLinkServiceImpl.java | 11 +++++-----
.../core/service/impl/ProjectServiceImpl.java | 24 +++++++++++-----------
.../core/service/impl/SavePointServiceImpl.java | 6 ++++--
.../core/utils/YarnQueueLabelExpression.java | 8 ++++----
.../console/system/controller/MenuController.java | 4 ++--
10 files changed, 60 insertions(+), 57 deletions(-)
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 f3c6f1fe3..3d178ac64 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
@@ -139,8 +139,8 @@ public class ApplicationController {
@Operation(summary = "Get applications dashboard data")
@PostMapping("dashboard")
public RestResponse dashboard(Long teamId) {
- Map<String, Serializable> map =
applicationInfoService.getDashboardDataMap(teamId);
- return RestResponse.success(map);
+ Map<String, Serializable> dashboardMap =
applicationInfoService.getDashboardDataMap(teamId);
+ return RestResponse.success(dashboardMap);
}
@Operation(summary = "List applications")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
index ba8bc259b..2234fa4aa 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
@@ -430,9 +430,9 @@ public class Application implements Serializable {
if (StringUtils.isBlank(this.options)) {
return Collections.emptyMap();
}
- Map<String, Object> map = JacksonUtils.read(this.options, Map.class);
- map.entrySet().removeIf(entry -> entry.getValue() == null);
- return map;
+ Map<String, Object> optionMap = JacksonUtils.read(this.options, Map.class);
+ optionMap.entrySet().removeIf(entry -> entry.getValue() == null);
+ return optionMap;
}
@JsonIgnore
@@ -538,9 +538,9 @@ public class Application implements Serializable {
@SuppressWarnings("unchecked")
public Map<String, Object> getHotParamsMap() {
if (StringUtils.isNotBlank(this.hotParams)) {
- Map<String, Object> map = JacksonUtils.read(this.hotParams, Map.class);
- map.entrySet().removeIf(entry -> entry.getValue() == null);
- return map;
+ Map<String, Object> hotParamsMap = JacksonUtils.read(this.hotParams,
Map.class);
+ hotParamsMap.entrySet().removeIf(entry -> entry.getValue() == null);
+ return hotParamsMap;
}
return Collections.EMPTY_MAP;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
index 611fc038e..9b415af59 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
@@ -136,13 +136,13 @@ public class FlinkCluster implements Serializable {
if (StringUtils.isBlank(this.options)) {
return Collections.emptyMap();
}
- Map<String, Object> map = JacksonUtils.read(this.options, Map.class);
+ Map<String, Object> optionMap = JacksonUtils.read(this.options, Map.class);
if (FlinkExecutionMode.YARN_SESSION == getFlinkExecutionModeEnum()) {
- map.put(ConfigKeys.KEY_YARN_APP_NAME(), this.clusterName);
- map.putAll(YarnQueueLabelExpression.getQueueLabelMap(yarnQueue));
+ optionMap.put(ConfigKeys.KEY_YARN_APP_NAME(), this.clusterName);
+ optionMap.putAll(YarnQueueLabelExpression.getQueueLabelMap(yarnQueue));
}
- map.entrySet().removeIf(entry -> entry.getValue() == null);
- return map;
+ optionMap.entrySet().removeIf(entry -> entry.getValue() == null);
+ return optionMap;
}
@JsonIgnore
@@ -176,16 +176,16 @@ public class FlinkCluster implements Serializable {
@JsonIgnore
public Map<String, Object> getProperties() {
- Map<String, Object> map = new HashMap<>();
- Map<String, String> dynamicProperties =
+ Map<String, Object> propertyMap = new HashMap<>();
+ Map<String, String> dynamicPropertyMap =
PropertiesUtils.extractDynamicPropertiesAsJava(this.getDynamicProperties());
- map.putAll(this.getOptionMap());
- map.putAll(dynamicProperties);
+ propertyMap.putAll(this.getOptionMap());
+ propertyMap.putAll(dynamicPropertyMap);
ResolveOrder resolveOrder = ResolveOrder.of(this.getResolveOrder());
if (resolveOrder != null) {
- map.put(CoreOptions.CLASSLOADER_RESOLVE_ORDER.key(),
resolveOrder.getName());
+ propertyMap.put(CoreOptions.CLASSLOADER_RESOLVE_ORDER.key(),
resolveOrder.getName());
}
- return map;
+ return propertyMap;
}
public static class SFunc {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertTypeEnum.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertTypeEnum.java
index 6756b8aad..09540c584 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertTypeEnum.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertTypeEnum.java
@@ -66,11 +66,11 @@ public enum AlertTypeEnum {
private static final Map<Integer, AlertTypeEnum> CACHE_MAP =
createCacheMap();
private static Map<Integer, AlertTypeEnum> createCacheMap() {
- Map<Integer, AlertTypeEnum> map = new HashMap<>();
+ Map<Integer, AlertTypeEnum> cacheMap = new HashMap<>();
for (AlertTypeEnum notifyType : AlertTypeEnum.values()) {
- map.put(notifyType.code, notifyType);
+ cacheMap.put(notifyType.code, notifyType);
}
- return Collections.unmodifiableMap(map);
+ return Collections.unmodifiableMap(cacheMap);
}
AlertTypeEnum(Integer code, Class<? extends AlertNotifyService> clazz) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
index 176da5fd7..11732cbc1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
@@ -175,16 +175,16 @@ public class ApplicationInfoServiceImpl extends
ServiceImpl<ApplicationMapper, A
}
// result json
- Map<String, Serializable> map = new HashMap<>(8);
- map.put("task", overview);
- map.put("jmMemory", totalJmMemory);
- map.put("tmMemory", totalTmMemory);
- map.put("totalTM", totalTm);
- map.put("availableSlot", availableSlot);
- map.put("totalSlot", totalSlot);
- map.put("runningJob", runningJob);
-
- return map;
+ Map<String, Serializable> dashboardDataMap = new HashMap<>(8);
+ dashboardDataMap.put("task", overview);
+ dashboardDataMap.put("jmMemory", totalJmMemory);
+ dashboardDataMap.put("tmMemory", totalTmMemory);
+ dashboardDataMap.put("totalTM", totalTm);
+ dashboardDataMap.put("availableSlot", availableSlot);
+ dashboardDataMap.put("totalSlot", totalSlot);
+ dashboardDataMap.put("runningJob", runningJob);
+
+ return dashboardDataMap;
}
@Override
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 bb9219c7c..227dab28c 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
@@ -86,13 +86,14 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
}
private void renderLinkUrl(ExternalLink link, Application app) {
- Map<String, String> map = new HashMap<>();
- map.put(PlaceholderTypeEnum.JOB_ID.get(), app.getJobId());
- map.put(PlaceholderTypeEnum.JOB_NAME.get(), app.getJobName());
- map.put(PlaceholderTypeEnum.YARN_ID.get(), app.getAppId());
+ Map<String, String> placeholderValueMap = new HashMap<>();
+ placeholderValueMap.put(PlaceholderTypeEnum.JOB_ID.get(), app.getJobId());
+ placeholderValueMap.put(PlaceholderTypeEnum.JOB_NAME.get(),
app.getJobName());
+ placeholderValueMap.put(PlaceholderTypeEnum.YARN_ID.get(), app.getAppId());
PropertyPlaceholderHelper propertyPlaceholderHelper = new
PropertyPlaceholderHelper("{", "}");
link.setRenderedLinkUrl(
-
propertyPlaceholderHelper.replacePlaceholders(link.getLinkUrl().trim(),
map::get));
+ propertyPlaceholderHelper.replacePlaceholders(
+ link.getLinkUrl().trim(), placeholderValueMap::get));
}
private boolean check(ExternalLink params) {
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 e6b28abac..ce3ec3d20 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
@@ -311,30 +311,30 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
private void eachFile(File file, List<Map<String, Object>> list, Boolean
isRoot) {
if (file != null && file.exists() && file.listFiles() != null) {
if (isRoot) {
- Map<String, Object> map = new HashMap<>(0);
- map.put("key", file.getName());
- map.put("title", file.getName());
- map.put("value", file.getAbsolutePath());
+ Map<String, Object> fileMap = new HashMap<>(0);
+ fileMap.put("key", file.getName());
+ fileMap.put("title", file.getName());
+ fileMap.put("value", file.getAbsolutePath());
List<Map<String, Object>> children = new ArrayList<>();
eachFile(file, children, false);
if (!children.isEmpty()) {
- map.put("children", children);
+ fileMap.put("children", children);
}
- list.add(map);
+ list.add(fileMap);
} else {
for (File item : Objects.requireNonNull(file.listFiles())) {
String title = item.getName();
String value = item.getAbsolutePath();
- Map<String, Object> map = new HashMap<>(0);
- map.put("key", title);
- map.put("title", title);
- map.put("value", value);
+ Map<String, Object> fileMap = new HashMap<>(0);
+ fileMap.put("key", title);
+ fileMap.put("title", title);
+ fileMap.put("value", value);
List<Map<String, Object>> children = new ArrayList<>();
eachFile(item, children, false);
if (!children.isEmpty()) {
- map.put("children", children);
+ fileMap.put("children", children);
}
- list.add(map);
+ list.add(fileMap);
}
}
}
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 60afb07c1..55e9a6fca 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
@@ -352,8 +352,10 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
if (applicationConfig == null) {
return null;
}
- Map<String, String> map = applicationConfig.readConfig();
- return FlinkUtils.isCheckpointEnabled(map) ?
map.get(SAVEPOINT_DIRECTORY.key()) : null;
+ Map<String, String> configMap = applicationConfig.readConfig();
+ return FlinkUtils.isCheckpointEnabled(configMap)
+ ? configMap.get(SAVEPOINT_DIRECTORY.key())
+ : null;
}
/**
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
index ab0a35bea..9604084f8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
@@ -108,11 +108,11 @@ public class YarnQueueLabelExpression {
return Collections.emptyMap();
}
YarnQueueLabelExpression yarnQueueLabelExpression = of(queueLabelExp);
- Map<String, String> map = new HashMap<>(2);
+ Map<String, String> queueLabelMap = new HashMap<>(2);
yarnQueueLabelExpression
.getLabelExpression()
- .ifPresent(labelExp -> map.put(ConfigKeys.KEY_YARN_APP_NODE_LABEL(),
labelExp));
- map.put(ConfigKeys.KEY_YARN_APP_QUEUE(), yarnQueueLabelExpression.queue);
- return map;
+ .ifPresent(labelExp ->
queueLabelMap.put(ConfigKeys.KEY_YARN_APP_NODE_LABEL(), labelExp));
+ queueLabelMap.put(ConfigKeys.KEY_YARN_APP_QUEUE(),
yarnQueueLabelExpression.queue);
+ return queueLabelMap;
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
index 58e2ea8fe..328fa0688 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -60,7 +60,7 @@ public class MenuController {
@PostMapping("list")
@RequiresPermissions("menu:view")
public RestResponse menuList(Menu menu) {
- Map<String, Object> maps = this.menuService.listMenuMap(menu);
- return RestResponse.success(maps);
+ Map<String, Object> menuMap = this.menuService.listMenuMap(menu);
+ return RestResponse.success(menuMap);
}
}
