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 09e0882eb improve streampark-console module base on [3.4 Collection
Rule] (#3219)
09e0882eb is described below
commit 09e0882eb3c37444d935af29fb3abb775c26465e
Author: eagleli123 <[email protected]>
AuthorDate: Sat Oct 7 21:14:02 2023 +0800
improve streampark-console module base on [3.4 Collection Rule] (#3219)
Co-authored-by: lihui <[email protected]>
---
.../java/org/apache/streampark/console/base/util/VueRouterUtils.java | 4 ++--
.../main/java/org/apache/streampark/console/core/bean/Dependency.java | 3 ++-
.../streampark/console/core/service/impl/ExternalLinkServiceImpl.java | 3 ++-
.../apache/streampark/console/system/controller/MenuController.java | 4 ++--
.../org/apache/streampark/console/system/service/MenuService.java | 3 +--
.../streampark/console/system/service/impl/MenuServiceImpl.java | 2 +-
6 files changed, 10 insertions(+), 9 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 b62f1f809..4b60a2308 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
@@ -83,7 +83,7 @@ public final class VueRouterUtils {
* @param <T> T
* @return ArrayList<VueRouter < T>>
*/
- public static <T> ArrayList<VueRouter<T>> buildVueRouter(List<VueRouter<T>>
routes) {
+ public static <T> List<VueRouter<T>> buildVueRouter(List<VueRouter<T>>
routes) {
if (routes == null) {
return null;
}
@@ -110,7 +110,7 @@ public final class VueRouterUtils {
}
});
- ArrayList<VueRouter<T>> list = new ArrayList<>();
+ List<VueRouter<T>> list = new ArrayList<>();
VueRouter<T> root = new VueRouter<>();
root.setName("Root");
root.setComponent("BasicView");
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
index 0c5b283bb..dae11e870 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
@@ -33,6 +33,7 @@ import java.io.File;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
@Data
@@ -65,7 +66,7 @@ public class Dependency {
}
File localJar = WebUtils.getAppTempDir();
File localUploads = new File(Workspace.local().APP_UPLOADS());
- HashSet<String> otherJars = new HashSet<>(other.jar);
+ Set<String> otherJars = new HashSet<>(other.jar);
for (String jarName : jar) {
if (!otherJars.contains(jarName)
|| !FileUtils.equals(new File(localJar, jarName), new
File(localUploads, jarName))) {
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 2d78edd46..170b5a859 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
@@ -37,6 +37,7 @@ import org.springframework.util.PropertyPlaceholderHelper;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -85,7 +86,7 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
}
private void renderLinkUrl(ExternalLink link, Application app) {
- HashMap<String, String> map = new HashMap();
+ 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());
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 956a7c5ff..c3aa46bde 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
@@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
-import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@Tag(name = "MENU_TAG")
@@ -55,7 +55,7 @@ public class MenuController {
@PostMapping("router")
public RestResponse getUserRouters(Long teamId) {
// TODO The teamId is required, get routers should be called after choose
teamId.
- ArrayList<VueRouter<Menu>> routers =
+ List<VueRouter<Menu>> routers =
this.menuService.getUserRouters(commonService.getUserId(), teamId);
return RestResponse.success(routers);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
index bd713811f..d83fac4b9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
@@ -22,7 +22,6 @@ import org.apache.streampark.console.system.entity.Menu;
import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -52,5 +51,5 @@ public interface MenuService extends IService<Menu> {
*/
void deleteMenus(String[] menuIds) throws Exception;
- ArrayList<VueRouter<Menu>> getUserRouters(Long userId, Long teamId);
+ List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index bf059053f..ac36f71c0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -148,7 +148,7 @@ public class MenuServiceImpl extends
ServiceImpl<MenuMapper, Menu> implements Me
}
@Override
- public ArrayList<VueRouter<Menu>> getUserRouters(Long userId, Long teamId) {
+ public List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId) {
List<VueRouter<Menu>> routes = new ArrayList<>();
// The query type is the menu type
List<Menu> menus = this.findUserMenus(userId, teamId);
