Removed repeated option variables from Tasks

Author: pedrogalvao

kb-importer/src/main/java/org/eclipse/steady/kb/command/Import.java

@@ -46,16 +46,16 @@
 public class Import implements Command {
 
   private static final String METADATA_JSON = "metadata.json";
-  private static final String UPLOAD_CONSTRUCT_OPTION = "u";
-  private static final String DIRECTORY_OPTION = "d";
-  private static final String OVERWRITE_OPTION = "o";
-  private static final String VERBOSE_OPTION = "v";
-  private static final String DELETE = "del";
-
-  private static final String UPLOAD_LONG_OPTION = "upload";
-  private static final String VERBOSE_LONG_OPTION = "verbose";
-  private static final String OVERWRITE_LONG_OPTION = "overwrite";
-  private static final String DIRECTORY_LONG_OPTION = "directory";
+  public static final String UPLOAD_CONSTRUCT_OPTION = "u";
+  public static final String DIRECTORY_OPTION = "d";
+  public static final String OVERWRITE_OPTION = "o";
+  public static final String VERBOSE_OPTION = "v";
+  public static final String DELETE = "del";
+
+  public static final String UPLOAD_LONG_OPTION = "upload";
+  public static final String VERBOSE_LONG_OPTION = "verbose";
+  public static final String OVERWRITE_LONG_OPTION = "overwrite";
+  public static final String DIRECTORY_LONG_OPTION = "directory";
 
   private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
 

kb-importer/src/main/java/org/eclipse/steady/kb/task/ImportAffectedLibraries.java

@@ -26,6 +26,7 @@
 import org.apache.logging.log4j.Logger;
 import org.eclipse.steady.backend.BackendConnectionException;
 import org.eclipse.steady.backend.BackendConnector;
+import org.eclipse.steady.kb.command.Import;
 import org.eclipse.steady.kb.command.Command;
 import org.eclipse.steady.kb.model.Artifact;
 import org.eclipse.steady.kb.model.Vulnerability;
@@ -45,8 +46,7 @@
  * </p>
  */
 public class ImportAffectedLibraries implements Task {
-  private static final String OVERWRITE_OPTION = "o";
-  private static final String DELETE = "del";
+
   private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
 
   /** {@inheritDoc} */
@@ -57,7 +57,7 @@ public void execute(
     if (artifacts == null || artifacts.isEmpty()) {
       return;
     }
-    if (args.containsKey(DELETE) && (boolean) args.get(DELETE)) {
+    if (args.containsKey(Import.DELETE) && (boolean) args.get(Import.DELETE)) {
       backendConnector.deletePatchEvalResults(vuln.getVulnId(), AffectedVersionSource.KAYBEE);
     }
 
@@ -75,7 +75,7 @@ public void execute(
               vuln.getVulnId(), purlGroup, purlArtifact, purlVersion, AffectedVersionSource.KAYBEE);
       if (affectedLibs != null && affectedLibs.length > 0) {
         AffectedLibrary affectedLibrary = affectedLibs[0];
-        Boolean overwrite = (Boolean) args.get(OVERWRITE_OPTION);
+        Boolean overwrite = (Boolean) args.get(Import.OVERWRITE_OPTION);
         if (overwrite || affectedLibrary.getAffected() == null) {
           setAfftectedLib(artifact, affectedLibrary);
           affectedLibsToUpsert.add(affectedLibrary);

kb-importer/src/main/java/org/eclipse/steady/kb/task/ImportVulnerability.java

@@ -38,6 +38,7 @@
 import org.eclipse.steady.backend.BackendConnectionException;
 import org.eclipse.steady.backend.BackendConnector;
 import org.eclipse.steady.kb.command.Command;
+import org.eclipse.steady.kb.command.Import;
 import org.eclipse.steady.kb.model.Commit;
 import org.eclipse.steady.kb.model.Note;
 import org.eclipse.steady.kb.model.Vulnerability;
@@ -53,10 +54,6 @@
  * <p>ImportVulnerability class.</p>
  */
 public class ImportVulnerability implements Task {
-  private static final String OVERWRITE_OPTION = "o";
-  private static final String DIRECTORY_OPTION = "d";
-  private static final String VERBOSE_OPTION = "v";
-  private static final String DELETE = "del";
 
   private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
   private BackendConnector backendConnector = null;
@@ -68,15 +65,13 @@ public void execute(
     String vulnId = vuln.getVulnId();
     this.backendConnector = _backendConnector;
 
-    if (args.containsKey(DELETE) && (boolean) args.get(DELETE)) {
-      backendConnector.deleteBug(vuln.getVulnId());
-    } else if (backendConnector.isBugExisting(vuln.getVulnId())) {
+    if (backendConnector.isBugExisting(vuln.getVulnId())) {
       log.info("Bug [{}] already exists in backend, analysis will be skipped", vuln.getVulnId());
       return;
     }
 
     List<Commit> commits = new ArrayList<Commit>();
-    File file = new File((String) args.get(DIRECTORY_OPTION));
+    File file = new File((String) args.get(Import.DIRECTORY_OPTION));
 
     File commitDirs[] =
         file.listFiles(
@@ -101,7 +96,7 @@ public boolean accept(File file) {
     Map<String, Set<ConstructChange>> allChanges = new HashMap<String, Set<ConstructChange>>();
     for (Commit commit : commits) {
       changes = ConstructSet.identifyConstructChanges(commit, allChanges);
-      if ((Boolean) args.get(VERBOSE_OPTION)) {
+      if ((Boolean) args.get(Import.VERBOSE_OPTION)) {
         for (ConstructChange chg : changes) {
           log.info(chg.toString());
         }