(incubator-streampark) branch dev-2.1.3 updated: [Improve] maven args check improvement

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
     new 858258ef3 [Improve] maven args check improvement
858258ef3 is described below

commit 858258ef3c2c9439360f27ce52e43cd111c43b73
Author: benjobs <benj...@gmail.com>
AuthorDate: Sun Dec 31 10:45:59 2023 +0800

    [Improve] maven args check improvement
---
 .../streampark/console/core/entity/Project.java    | 36 ++++++++--------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
index 658bb575f..ebf023d08 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -43,12 +43,12 @@ import org.eclipse.jgit.lib.Constants;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Data
@@ -263,30 +263,20 @@ public class Project implements Serializable {
       return dangerArgs;
     }
 
-    String[] args = param.split("\\s+");
-    List<String> dangerArgs = new ArrayList<>();
-    for (String arg : args) {
-      if (arg.length() == 1) {
-        if (arg.equals("|")) {
-          dangerArgs.add("|");
-        }
-        if (arg.equals("&")) {
-          dangerArgs.add("&");
-        }
-      } else {
-        arg = arg.substring(0, 2);
-        if (arg.equals("||")) {
-          dangerArgs.add("||");
-        }
-        if (arg.equals("&&")) {
-          dangerArgs.add("&&");
+    String result = null;
+    Iterator<String> dangerIter = Arrays.asList(";", "|", "&", "||", 
"&&").iterator();
+    Iterator<String> argsIter = Arrays.stream(param.split("\\s+")).iterator();
+
+    while (result == null && dangerIter.hasNext()) {
+      String danger = dangerIter.next();
+      while (result == null && argsIter.hasNext()) {
+        String arg = argsIter.next();
+        if (arg.contains(danger)) {
+          result = arg;
         }
       }
     }
-    if (!dangerArgs.isEmpty()) {
-      return dangerArgs.stream().collect(Collectors.joining(","));
-    }
-    return null;
+    return result;
   }
 
   @JsonIgnore