Merge pull request #20 from blackduck-inc/SIGINT-2283

SIGINT-2283 UI/UX Modification

src/main/java/io/jenkins/plugins/security/scan/extension/SecurityScan.java

@@ -135,8 +135,6 @@ public interface SecurityScan {
 
     public String getPolaris_assessment_types();
 
-    public String getPolaris_triage();
-
     public String getPolaris_branch_name();
 
     public String getPolaris_prComment_severities();

src/main/java/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle.java

@@ -64,7 +64,6 @@ public class SecurityScanFreestyle extends Builder implements SecurityScan, Free
     private String polaris_application_name;
     private String polaris_project_name;
     private String polaris_assessment_types;
-    private String polaris_triage;
     private String polaris_branch_name;
     private String polaris_branch_parent_name;
     private String polaris_prComment_severities;
@@ -121,9 +120,17 @@ public class SecurityScanFreestyle extends Builder implements SecurityScan, Free
     private String bridgecli_download_version;
     private String bridgecli_install_directory;
     private Boolean include_diagnostics;
+    private Boolean coverity_include_diagnostics;
+    private Boolean blackducksca_include_diagnostics;
+    private Boolean polaris_include_diagnostics;
+    private Boolean srm_include_diagnostics;
     private Boolean network_airgap;
 
     private String mark_build_status;
+    private String blackducksca_mark_build_status;
+    private String coverity_mark_build_status;
+    private String polaris_mark_build_status;
+    private String srm_mark_build_status;
 
     @DataBoundConstructor
     public SecurityScanFreestyle() {
@@ -362,10 +369,6 @@ public String getPolaris_assessment_types() {
         return polaris_assessment_types;
     }
 
-    public String getPolaris_triage() {
-        return polaris_triage;
-    }
-
     public String getPolaris_branch_name() {
         return polaris_branch_name;
     }
@@ -526,6 +529,22 @@ public Boolean isInclude_diagnostics() {
         return include_diagnostics;
     }
 
+    public Boolean isCoverity_include_diagnostics() {
+        return coverity_include_diagnostics;
+    }
+
+    public Boolean isBlackducksca_include_diagnostics() {
+        return blackducksca_include_diagnostics;
+    }
+
+    public Boolean isPolaris_include_diagnostics() {
+        return polaris_include_diagnostics;
+    }
+
+    public Boolean isSrm_include_diagnostics() {
+        return srm_include_diagnostics;
+    }
+
     public Boolean isNetwork_airgap() {
         return network_airgap;
     }
@@ -534,6 +553,22 @@ public String getMark_build_status() {
         return mark_build_status;
     }
 
+    public String getBlackducksca_mark_build_status() {
+        return blackducksca_mark_build_status;
+    }
+
+    public String getCoverity_mark_build_status() {
+        return coverity_mark_build_status;
+    }
+
+    public String getPolaris_mark_build_status() {
+        return polaris_mark_build_status;
+    }
+
+    public String getSrm_mark_build_status() {
+        return srm_mark_build_status;
+    }
+
     public String getSrm_url() {
         return srm_url;
     }
@@ -785,11 +820,6 @@ public void setPolaris_assessment_types(String polaris_assessment_types) {
         this.polaris_assessment_types = Util.fixEmptyAndTrim(polaris_assessment_types);
     }
 
-    @DataBoundSetter
-    public void setPolaris_triage(String polaris_triage) {
-        this.polaris_triage = Util.fixEmptyAndTrim(polaris_triage);
-    }
-
     @DataBoundSetter
     public void setPolaris_branch_name(String polaris_branch_name) {
         this.polaris_branch_name = Util.fixEmptyAndTrim(polaris_branch_name);
@@ -967,6 +997,30 @@ public void setInclude_diagnostics(Boolean include_diagnostics) {
         this.include_diagnostics = include_diagnostics ? true : null;
     }
 
+    @DataBoundSetter
+    public void setCoverity_include_diagnostics(Boolean coverity_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.COVERITY.name().toLowerCase()))
+            this.include_diagnostics = coverity_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setBlackducksca_include_diagnostics(Boolean blackducksca_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.BLACKDUCKSCA.name().toLowerCase()))
+            this.include_diagnostics = blackducksca_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setPolaris_include_diagnostics(Boolean polaris_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.POLARIS.name().toLowerCase()))
+            this.include_diagnostics = polaris_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setSrm_include_diagnostics(Boolean srm_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.SRM.name().toLowerCase()))
+            this.include_diagnostics = srm_include_diagnostics ? true : null;
+    }
+
     @DataBoundSetter
     public void setNetwork_airgap(Boolean network_airgap) {
         this.network_airgap = network_airgap ? true : null;
@@ -977,6 +1031,31 @@ public void setMark_build_status(String mark_build_status) {
         this.mark_build_status = mark_build_status;
     }
 
+    @DataBoundSetter
+    public void setCoverity_mark_build_status(String coverity_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.COVERITY.name().toLowerCase()))
+            this.coverity_mark_build_status = this.mark_build_status = Util.fixEmptyAndTrim(coverity_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setBlackducksca_mark_build_status(String blackducksca_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.BLACKDUCKSCA.name().toLowerCase()))
+            this.blackducksca_mark_build_status =
+                    this.mark_build_status = Util.fixEmptyAndTrim(blackducksca_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setPolaris_mark_build_status(String polaris_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.POLARIS.name().toLowerCase()))
+            this.polaris_mark_build_status = this.mark_build_status = Util.fixEmptyAndTrim(polaris_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setSrm_mark_build_status(String srm_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.SRM.name().toLowerCase()))
+            this.srm_mark_build_status = this.mark_build_status = Util.fixEmptyAndTrim(srm_mark_build_status);
+    }
+
     @DataBoundSetter
     public void setSrm_url(String srm_url) {
         this.srm_url = srm_url;
@@ -1153,7 +1232,31 @@ public ListBoxModel doFillProductItems() {
         }
 
         @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
-        public ListBoxModel doFillMark_build_statusItems() {
+        public ListBoxModel doFillBlackducksca_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillPolaris_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillCoverity_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillSrm_mark_build_statusItems() {
             ListBoxModel items = new ListBoxModel();
             items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
             items.addAll(ParameterMappingService.getMarkBuildStatusItems());