This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch mvn_args in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 820ff35ac2b2a522b1244572391bf48c94dc99d0 Author: benjobs <[email protected]> AuthorDate: Sun Dec 31 10:49:27 2023 +0800 [Improve] maven build 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 653405ba0..5c329b10e 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 @@ -255,30 +255,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
