fix: change result status to String

vismaosscomponents · Jun 25, 2021 · 40768c1 · 40768c1
1 parent ec9703d
commit 40768c1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/com/synopsys/protecode/sc/jenkins/HttpApiConnector.java b/src/main/java/com/synopsys/protecode/sc/jenkins/HttpApiConnector.java
@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.google.common.net.UrlEscapers;
-import com.synopsys.protecode.sc.jenkins.ProtecodeSc.Status;
 import com.synopsys.protecode.sc.jenkins.exceptions.ApiAuthenticationException;
 import com.synopsys.protecode.sc.jenkins.exceptions.ApiException;
 import org.glassfish.jersey.client.ClientConfig;
@@ -289,14 +288,11 @@ public PollResult poll(String productId) {
                     + response.getMeta().getCode());
             return new PollResult(true, false);
         }
-        Status responseStatus = response.getResults().getStatus();
+        String responseStatus = response.getResults().getStatus();
         response.setArtifactName(artifact.getName());
-        // Busy: we continue polling
-        if (Status.B.equals(responseStatus)) {
-            return new PollResult(false, false);
-        }
 
-        if (Status.R.equals(responseStatus)) {
+        // Status R and F are final
+        if ("R".equals(responseStatus)) {
             int componentsFound = response.getResults().getComponents().size();
             log.println("Artifact " + artifact.getName()
                     + " polling success, meta response code "
@@ -312,10 +308,14 @@ public PollResult poll(String productId) {
                 return new PollResult(true, false);
             }
         }
-        log.println("Artifact " + artifact.getName()
-                + " polling completed, status is " + responseStatus);
-        return new PollResult(true, false);
-
+        if ("F".equals(responseStatus)) {
+            log.println("Artifact " + artifact.getName()
+                    + " polling completed, status is " + responseStatus);
+            return new PollResult(true, false);
+        }
+        // Busy: we continue polling
+        log.println("Artifact " + artifact.getName() + " status is: " + responseStatus + ", continuing polling");
+        return new PollResult(false, false);
     }
 
     public void close() {

diff --git a/src/main/java/com/synopsys/protecode/sc/jenkins/ProtecodeSc.java b/src/main/java/com/synopsys/protecode/sc/jenkins/ProtecodeSc.java
@@ -43,7 +43,7 @@ public Results getResults() {
     }
 
     public static enum Status {
-        B("Busy"), R("Ready"), F("Fail");
+        B("Busy"), R("Ready"), F("Fail"), S("Scanning"), D("Downloading"), P("P-Unknown");
 
         private String value;
 
@@ -79,7 +79,7 @@ public static class Results {
 
         private List<Component> components;
 
-        private Status status;
+        private String status;
 
         private String report_url;
 
@@ -110,7 +110,7 @@ public Integer getId() {
             return id;
         }
 
-        public Status getStatus() {
+        public String getStatus() {
             return status;
         }