Removed skip condition in ImportVulnerability and changed tests accordingly

Author: Pedro Galvão

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

@@ -59,6 +59,16 @@ public class Import implements Command {
 
   private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
 
+  private BackendConnector backendConnector;
+
+  public Import() {
+    this.backendConnector = BackendConnector.getInstance();
+  }
+
+  public Import(BackendConnector backendConnector) {
+    this.backendConnector = backendConnector;
+  }
+
   /** {@inheritDoc} */
   @Override
   public Command.NAME getCommandName() {
@@ -121,7 +131,7 @@ private void importVuln(HashMap<String, Object> args, String dirPath) {
     String vulnId = vuln.getVulnId();
     boolean bugExists = false;
     try {
-      bugExists = BackendConnector.getInstance().isBugExisting(vulnId);
+      bugExists = this.backendConnector.isBugExisting(vulnId);
     } catch (BackendConnectionException e) {
       log.error("Can't connect to the Backend");
       return;
@@ -142,7 +152,7 @@ private void importVuln(HashMap<String, Object> args, String dirPath) {
     for (Task task : importTasks) {
       try {
         args.put(DIRECTORY_OPTION, dirPath);
-        task.execute(vuln, args, BackendConnector.getInstance());
+        task.execute(vuln, args, backendConnector);
       } catch (Exception e) {
         log.error(
             "Got ["

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

@@ -65,11 +65,6 @@ public void execute(
     String vulnId = vuln.getVulnId();
     this.backendConnector = _backendConnector;
 
-    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(Import.DIRECTORY_OPTION));
 

kb-importer/src/test/java/org/eclipse/steady/kb/command/ImportTest.java

@@ -17,12 +17,23 @@
  * SPDX-FileCopyrightText: Copyright (c) 2018-2020 SAP SE or an SAP affiliate company and Eclipse Steady contributors
  */
 package org.eclipse.steady.kb.command;
+import org.eclipse.steady.kb.task.MockBackConnector;
+import org.eclipse.steady.shared.json.model.AffectedLibrary;
+import org.eclipse.steady.kb.model.Vulnerability;
+import org.eclipse.steady.kb.util.Metadata;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
 import java.util.HashMap;
+import java.util.List;
 import org.apache.commons.cli.Options;
+
+import java.io.IOException;
 import org.eclipse.steady.kb.exception.ValidationException;
+import com.google.gson.JsonSyntaxException;
+import org.eclipse.steady.backend.BackendConnectionException;
 import org.junit.Test;
 
 public class ImportTest {
@@ -52,4 +63,19 @@ public void validationFail() throws ValidationException {
     args.put("d", "invalidDir");
     command.validate(args);
   }
+
+  @Test
+  public void testImportSkipExistingBug()
+      throws JsonSyntaxException, IOException, BackendConnectionException {
+    Vulnerability vuln = new Vulnerability();
+    vuln.setVulnId("CVE-TEST01");
+    MockBackConnector mockBackendConnector = new MockBackConnector();
+    HashMap<String, Object> args = new HashMap<String, Object>();
+    args.put("o", false);
+    args.put("v", false);
+    Import command = new Import(mockBackendConnector);
+    command.run(args);
+    assertNull(mockBackendConnector.getUploadJson());
+  }
+
 }

kb-importer/src/test/java/org/eclipse/steady/kb/task/TestImportVulnerability.java

@@ -58,20 +58,6 @@ public void testImportVuln() throws JsonSyntaxException, IOException, BackendCon
     assertNotNull(bug.getDescription());
   }
 
-  @Test
-  public void testImportVulnSkipExistingBug()
-      throws JsonSyntaxException, IOException, BackendConnectionException {
-    Vulnerability vuln = new Vulnerability();
-    vuln.setVulnId("CVE-TEST01");
-    MockBackConnector mockBackendConnector = new MockBackConnector();
-    HashMap<String, Object> args = new HashMap<String, Object>();
-    args.put("o", false);
-    args.put("v", false);
-    ImportVulnerability importVuln = new ImportVulnerability();
-    importVuln.execute(vuln, args, mockBackendConnector);
-    assertNull(mockBackendConnector.getUploadJson());
-  }
-
   @AfterClass
   public static void cleanup() {
     try {