PA-12623 & PA-12619 Add CFamily to plugin and improve error message (#30

)
soos-io · Jan 15, 2024 · a798303 · a798303
1 parent 70af280
commit a798303
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.soos</groupId>
     <artifactId>sca</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 
     <name>SOOS Integrations core</name>
     <description>Core package used on all our java integrations development.</description>

diff --git a/src/main/java/io/soos/integration/domain/PackageManagers.java b/src/main/java/io/soos/integration/domain/PackageManagers.java
@@ -1,7 +1,7 @@
 package io.soos.integration.domain;
 
 public enum PackageManagers {
-    DART("Dart"), ERLANG("Erlang"), HOMEBREW("Homebrew"), JAVA("Java"), NPM("NPM"), NUGET("NuGet"), PHP("PHP"), PYTHON("Python"), RUBY("Ruby"), RUST("Rust"), GO("Go");
+    DART("Dart"), CFAMILY("CFamily"), ERLANG("Erlang"), HOMEBREW("Homebrew"), JAVA("Java"), NPM("NPM"), NUGET("NuGet"), PHP("PHP"), PYTHON("Python"), RUBY("Ruby"), RUST("Rust"), GO("Go");
 
     private String packageManager;
 

diff --git a/src/main/java/io/soos/integration/domain/Script.java b/src/main/java/io/soos/integration/domain/Script.java
@@ -6,10 +6,7 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class Script {
@@ -42,21 +39,31 @@ public void load() {
         this.setPackageManagers();
     }
 
-    public void setPackageManagers() {
+    public void setPackageManagers() throws IllegalArgumentException {
         String packageManagers = this.params.get(Constants.MAP_PARAM_PACKAGE_MANAGERS_KEY);
         this.packageManagers = new ArrayList<>();
-        if(StringUtils.isNotBlank(packageManagers)){
-            List<String> packageManagersList = new ArrayList<>();
-            packageManagersList.addAll(Arrays.stream(packageManagers.split(",")).map(String::trim).collect(Collectors.toList()));
-            for(String packageManager:packageManagersList){
-                this.packageManagers.add(Arrays.stream(PackageManagers.values())
-                        .filter(e -> e.name().equalsIgnoreCase(packageManager)).findAny().orElse(null));
+        if (StringUtils.isNotBlank(packageManagers)) {
+            List<String> packageManagersList = Arrays.stream(packageManagers.split(","))
+                    .map(String::trim)
+                    .collect(Collectors.toList());
+            String validOptions = Arrays.stream(PackageManagers.values())
+                    .map(Enum::name)
+                    .collect(Collectors.joining(", "));
+            for (String packageManager : packageManagersList) {
+                PackageManagers matchedPackageManager = Arrays.stream(PackageManagers.values())
+                        .filter(e -> e.name().equalsIgnoreCase(packageManager))
+                        .findAny()
+                        .orElseThrow(() -> new IllegalArgumentException(
+                                "Invalid package manager: " + packageManager +
+                                        ", valid options are: " + validOptions));
+                this.packageManagers.add(matchedPackageManager);
             }
-        }else{
+        } else {
             this.packageManagers = null;
         }
     }
 
+
     private void setOnFailure() {
         String onFailure = this.params.get(Constants.MAP_PARAM_ON_FAILURE_KEY);
         switch (onFailure) {