From 81938b396d9f9c06824ca9493c11933aeb9603ef Mon Sep 17 00:00:00 2001
From: Maksudur Rahman Maruf <maruf.bsnm@gmail.com>
Date: Tue, 10 Oct 2023 14:48:02 +0600
Subject: [PATCH] high priority issue fixed

---
 .../jenkins/scan/PluginParametersHandler.java | 16 ++---
 .../jenkins/scan/bridge/BridgeInstall.java    |  2 -
 .../extension/pipeline/SecurityScanStep.java  |  1 +
 .../jenkins/scan/global/OsNameTask.java       |  1 +
 .../blackduck/BlackDuckParametersService.java | 72 +++++++++++++------
 5 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java b/src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java
index 2fd4d8e2..8b307ca0 100644
--- a/src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java
+++ b/src/main/java/com/synopsys/integration/jenkins/scan/PluginParametersHandler.java
@@ -88,12 +88,10 @@ public int initializeScanner(Map<String, Object> scanParameters) throws PluginEx
 
             try {
                 exitCode = scanner.runScanner(scanParameters, bridgeInstallationPath);
+            } catch (PluginExceptionHandler e) {
+                throw new PluginExceptionHandler("Workflow failed! " + e.getMessage());
             } catch (Exception e) {
-                if (e instanceof PluginExceptionHandler) {
-                    throw new PluginExceptionHandler("Workflow failed! " + e.getMessage());
-                } else {
-                    throw new ScannerException(ExceptionMessages.scannerFailureMessage(e.getMessage()));
-                }
+                throw new ScannerException(ExceptionMessages.scannerFailureMessage(e.getMessage()));
             }
         }
 
@@ -106,9 +104,11 @@ public int initializeScanner(Map<String, Object> scanParameters) throws PluginEx
     }
 
     public void logMessagesForParameters(Map<String, Object> scanParameters, Set<String> securityProducts) {
+        final String LOG_DASH = " --- ";
+
         logger.println("-------------------------- Parameter Validation Initiated --------------------------");
 
-        logger.info(" --- " + ApplicationConstants.PRODUCT_KEY + " = " + securityProducts.toString());
+        logger.info(LOG_DASH + ApplicationConstants.PRODUCT_KEY + " = " + securityProducts.toString());
 
         for (String product : securityProducts) {
             String securityProduct = product.toLowerCase();
@@ -122,7 +122,7 @@ public void logMessagesForParameters(Map<String, Object> scanParameters, Set<Str
                             || key.equals(ApplicationConstants.COVERITY_PASSPHRASE_KEY)) {
                         value = LogMessages.ASTERISKS;
                     }
-                    logger.info(" --- " + key + " = " + value.toString());
+                    logger.info(LOG_DASH + key + " = " + value.toString());
                 }
             }
 
@@ -136,7 +136,7 @@ public void logMessagesForParameters(Map<String, Object> scanParameters, Set<Str
             if(key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_URL) || key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_DOWNLOAD_VERSION)
                     || key.equals(ApplicationConstants.SYNOPSYS_BRIDGE_INSTALL_DIRECTORY) || key.equals(ApplicationConstants.INCLUDE_DIAGNOSTICS_KEY)) {
                 Object value = entry.getValue();
-                logger.info(" --- " + key + " = " + value.toString());
+                logger.info(LOG_DASH + key + " = " + value.toString());
             }
         }
     }
diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java b/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java
index c1800d9b..53f40147 100644
--- a/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java
+++ b/src/main/java/com/synopsys/integration/jenkins/scan/bridge/BridgeInstall.java
@@ -19,12 +19,10 @@
 
 public class BridgeInstall {
     private final LoggerWrapper logger;
-    private final TaskListener listener;
     private final FilePath workspace;
 
     public BridgeInstall(FilePath workspace, TaskListener listener) {
         this.workspace = workspace;
-        this.listener = listener;
         this.logger = new LoggerWrapper(listener);
     }
 
diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java
index 1d5045dd..dced53a5 100644
--- a/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java
+++ b/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java
@@ -97,6 +97,7 @@ public class SecurityScanStep extends Step implements Serializable {
 
     @DataBoundConstructor
     public SecurityScanStep() {
+        // this block is kept empty intentionally
     }
 
     @DataBoundSetter
diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java b/src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java
index 098b795a..1508a9a9 100644
--- a/src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java
+++ b/src/main/java/com/synopsys/integration/jenkins/scan/global/OsNameTask.java
@@ -20,5 +20,6 @@ public String invoke(File workspace, VirtualChannel channel) {
 
     @Override
     public void checkRoles(RoleChecker checker) throws SecurityException {
+        // this method is kept empty intentionally
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java b/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java
index c6e60bf5..e8b56a7b 100644
--- a/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java
+++ b/src/main/java/com/synopsys/integration/jenkins/scan/service/scan/blackduck/BlackDuckParametersService.java
@@ -67,38 +67,22 @@ public BlackDuck prepareBlackDuckObjectForBridge(Map<String, Object> blackDuckPa
                     blackDuck.setToken(value);
                     break;
                 case ApplicationConstants.BLACKDUCK_INSTALL_DIRECTORY_KEY:
-                    blackDuck.getInstall().setDirectory(value);
+                    setInstallDirectory(blackDuck, value);
                     break;
                 case ApplicationConstants.BLACKDUCK_SCAN_FULL_KEY:
-                    if (value.equals("true") || value.equals("false")) {
-                        blackDuck.getScan().setFull(Boolean.parseBoolean(value));
-                    }
+                    setScanFull(blackDuck, value);
                     break;
                 case ApplicationConstants.BLACKDUCK_SCAN_FAILURE_SEVERITIES_KEY:
-                    if (!value.isEmpty()) {
-                        List<String> failureSeverities = new ArrayList<>();
-                        String[] failureSeveritiesInput = value.toUpperCase().split(",");
-
-                        for (String input : failureSeveritiesInput) {
-                            failureSeverities.add(input.trim());
-                        }
-                        blackDuck.getScan().getFailure().setSeverities(failureSeverities);
-                    }
+                    setScanFailureSeverities(blackDuck, value);
                     break;
                 case ApplicationConstants.BLACKDUCK_AUTOMATION_FIXPR_KEY:
-                    if (value.equals("true") || value.equals("false")) {
-                        blackDuck.getAutomation().setFixpr(Boolean.parseBoolean(value));
-                    }
+                    setAutomationFixpr(blackDuck, value);
                     break;
                 case ApplicationConstants.BLACKDUCK_AUTOMATION_PRCOMMENT_KEY:
-                    if (value.equals("true") || value.equals("false")) {
-                        blackDuck.getAutomation().setPrComment(Boolean.parseBoolean(value));
-                    }
+                    setAutomationPrComment(blackDuck, value);
                     break;
                 case ApplicationConstants.BLACKDUCK_DOWNLOAD_URL_KEY:
-                    Download download = new Download();
-                    download.setUrl(value);
-                    blackDuck.setDownload(download);
+                    setDownloadUrl(blackDuck, value);
                     break;
                 default:
                     break;
@@ -108,4 +92,48 @@ public BlackDuck prepareBlackDuckObjectForBridge(Map<String, Object> blackDuckPa
         return blackDuck;
     }
 
+    private void setInstallDirectory(BlackDuck blackDuck, String value) {
+        blackDuck.getInstall().setDirectory(value);
+    }
+
+    private void setScanFull(BlackDuck blackDuck, String value) {
+        if (isBoolean(value)) {
+            blackDuck.getScan().setFull(Boolean.parseBoolean(value));
+        }
+    }
+
+    private void setScanFailureSeverities(BlackDuck blackDuck, String value) {
+        if (!value.isEmpty()) {
+            List<String> failureSeverities = new ArrayList<>();
+            String[] failureSeveritiesInput = value.toUpperCase().split(",");
+
+            for (String input : failureSeveritiesInput) {
+                failureSeverities.add(input.trim());
+            }
+            blackDuck.getScan().getFailure().setSeverities(failureSeverities);
+        }
+    }
+
+    private void setAutomationFixpr(BlackDuck blackDuck, String value) {
+        if (isBoolean(value)) {
+            blackDuck.getAutomation().setFixpr(Boolean.parseBoolean(value));
+        }
+    }
+
+    private void setAutomationPrComment(BlackDuck blackDuck, String value) {
+        if (isBoolean(value)) {
+            blackDuck.getAutomation().setPrComment(Boolean.parseBoolean(value));
+        }
+    }
+
+    private void setDownloadUrl(BlackDuck blackDuck, String value) {
+        Download download = new Download();
+        download.setUrl(value);
+        blackDuck.setDownload(download);
+    }
+
+    private boolean isBoolean(String value) {
+        return value.equals("true") || value.equals("false");
+    }
+
 }