setting default values for the new parameters in remoteCreate (#289)

hygieia · Aug 12, 2022 · e38eeef · e38eeef
1 parent 45865f9
commit e38eeef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>api</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>3.4.44</version>
+    <version>3.4.45</version>
     <description>Hygieia Rest API Layer</description>
     <url>https://github.com/Hygieia/api</url>
 

diff --git a/src/main/java/com/capitalone/dashboard/request/DashboardRemoteRequest.java b/src/main/java/com/capitalone/dashboard/request/DashboardRemoteRequest.java
@@ -6,6 +6,7 @@
 import com.capitalone.dashboard.model.CollectorItem;
 import com.capitalone.dashboard.model.CollectorType;
 import com.capitalone.dashboard.model.Owner;
+import com.capitalone.dashboard.model.WhiteSourceComponent;
 import com.capitalone.dashboard.util.GitHubParsedUrl;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -17,6 +18,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Arrays;
 
 public class DashboardRemoteRequest extends BaseRequest {
     @Valid
@@ -237,6 +239,18 @@ public CollectorItem toCollectorItem(Collector collector) throws HygieiaExceptio
                         throw new HygieiaException(toolName + " collector does not support field: " + key, HygieiaException.COLLECTOR_ITEM_CREATE_ERROR);
                     }
                 }
+                // set options with defaults
+                if (collector.getName().equals("WhiteSource") && !options.keySet().contains("localConfig")){
+                    collectorItem.getOptions().put("localConfig", false);
+                }
+                else if(collector.getName().equals("Checkmarx")){
+                    if(!options.keySet().contains("fileExclusions") || options.get("fileExclusions").equals("")){
+                        collectorItem.getOptions().put("fileExclusions", " ");
+                    }
+                    if(!options.keySet().contains("folderExclusions") || options.get("folderExclusions").equals("")){
+                        collectorItem.getOptions().put("folderExclusions", " ");
+                    }
+                }
                 return collectorItem;
             } else {
                 throw new HygieiaException("Missing required fields. " + toolName + " collector required fields are: " + String.join(", ", collector.getUniqueFields().keySet()), HygieiaException.COLLECTOR_ITEM_CREATE_ERROR);