(incubator-streampark) branch dev-2.1.2 updated: [Improve] maven build 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.2
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


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

commit be2483b031a4537d97e6b396d265356b5816f2d2
Author: benjobs <benj...@gmail.com>
AuthorDate: Thu Nov 30 13:18:47 2023 +0800

    [Improve] maven build args check improvement
---
 .../streampark/console/core/entity/Project.java    | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 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 413009f52..875c5a317 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
@@ -22,7 +22,6 @@ import org.apache.streampark.common.conf.InternalConfigHolder;
 import org.apache.streampark.common.conf.Workspace;
 import org.apache.streampark.common.util.CommandUtils;
 import org.apache.streampark.common.util.Utils;
-import org.apache.streampark.console.base.exception.ApiAlertException;
 import org.apache.streampark.console.base.exception.ApiDetailException;
 import org.apache.streampark.console.base.util.CommonUtils;
 import org.apache.streampark.console.base.util.GitUtils;
@@ -223,7 +222,7 @@ public class Project implements Serializable {
       } else {
         throw new IllegalArgumentException(
             String.format(
-                "Invalid build args, dangerous operator detected: %s, in your 
buildArgs: %s",
+                "Invalid build args, dangerous operation symbol detected: %s, 
in your buildArgs: %s",
                 dangerArgs.stream().collect(Collectors.joining(",")), 
this.buildArgs));
       }
     }
@@ -231,17 +230,19 @@ public class Project implements Serializable {
     String setting = 
InternalConfigHolder.get(CommonConfig.MAVEN_SETTINGS_PATH());
     if (StringUtils.isNotBlank(setting)) {
       List<String> dangerArgs = getLogicalOperators(setting);
-      ApiAlertException.throwIfTrue(
-          !dangerArgs.isEmpty(),
-          String.format(
-              "Invalid maven setting path, dangerous operator detected: %s, in 
your maven setting path: %s",
-              dangerArgs.stream().collect(Collectors.joining(",")), setting));
-      File file = new File(setting);
-      if (file.exists() && file.isFile()) {
-        cmdBuffer.append(" --settings ").append(setting);
+      if (dangerArgs.isEmpty()) {
+        File file = new File(setting);
+        if (file.exists() && file.isFile()) {
+          cmdBuffer.append(" --settings ").append(setting);
+        } else {
+          throw new IllegalArgumentException(
+              String.format("Invalid maven setting path, %s no exists or not 
file", setting));
+        }
       } else {
         throw new IllegalArgumentException(
-            String.format("Invalid maven setting path, %s no exists or not 
file", setting));
+            String.format(
+                "Invalid maven setting path, dangerous operation symbol 
detected: %s, in your maven setting path: %s",
+                dangerArgs.stream().collect(Collectors.joining(",")), 
setting));
       }
     }
     return cmdBuffer.toString();