improve streampark-console module base on [3.4 Collection Rule]

apache · Oct 7, 2023 · 2f9abdd · 2f9abdd
1 parent fe98be8
commit 2f9abdd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/...console-service/src/main/java/org/apache/streampark/console/base/util/VueRouterUtils.java b/...console-service/src/main/java/org/apache/streampark/console/base/util/VueRouterUtils.java
@@ -83,7 +83,7 @@ public static <T> RouterTree<T> buildRouterTree(List<RouterTree<T>> nodes) {
    * @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 static <T> ArrayList<VueRouter<T>> buildVueRouter(List<VueRouter<T>> rout
           }
         });
 
-    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/...ark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java b/...ark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
@@ -33,6 +33,7 @@
 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 boolean equals(Dependency other) {
     }
     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/...rc/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java b/...rc/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
@@ -37,6 +37,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -85,7 +86,7 @@ public List<ExternalLink> render(Long appId) {
   }
 
   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/...service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java b/...service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -37,7 +37,7 @@
 
 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/...nsole-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java b/...nsole-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
@@ -22,7 +22,6 @@
 
 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/...vice/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java b/...vice/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -148,7 +148,7 @@ public void deleteMenus(String[] menuIds) throws Exception {
   }
 
   @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);