fix: make 5 consequent attempts to getAnalysis during polling if operation does not succeed with 404;

fix: make 5 attempts to re-upload files if operation does not succeed;
fix: do not try to getAnalysis if `upload files` is not succeed (i.e. `missingFiles` is not empty after uploads);
fix: avoid remove operation for empty immutable List.

Author: ArtsiomCh

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## [2.2.2] - 2022-03
+- fix: make 5 consequent attempts to getAnalysis during polling if operation does not succeed with 404
+- fix: make 5 attempts to re-upload files if operation does not succeed
+- fix: do not try to getAnalysis if `upload files` is not succeed (i.e. `missingFiles` is not empty after uploads)
+- fix: avoid remove operation for empty immutable List
 - fix: check file in marker for nullability before proceed
 - feat: provide unique (per project) `shard` to getAnalysis call
 

src/main/java/ai/deepcode/javaclient/core/AnalysisDataBase.java

@@ -204,9 +204,12 @@ public void updateCachedResultsForFiles(
       @NotNull Collection<Object> allProjectFiles,
       @NotNull Object progress) {
     Collection<Object> filesToRemove = mapProject2RemovedFiles.remove(project);
-    if (filesToRemove == null) filesToRemove = Collections.emptyList();
-    // remove from server only files physically removed from Project
-    filesToRemove.removeAll(allProjectFiles);
+    if (filesToRemove == null) {
+      filesToRemove = Collections.emptyList();
+    } else {
+      // remove from server only files physically removed from Project
+      filesToRemove.removeAll(allProjectFiles);
+    }
     if (allProjectFiles.isEmpty() && filesToRemove.isEmpty()) {
       dcLogger.logWarn("updateCachedResultsForFiles requested for empty list of files");
       return;
@@ -304,7 +307,11 @@ private Map<Object, List<SuggestionForFile>> retrieveSuggestions(
     if (filesToProceed.isEmpty()) { // no sense to proceed
       return EMPTY_MAP;
     }
-    uploadFilesStep(project, filesToProceed, missingFiles, progress);
+    boolean filesUploaded = uploadFilesStep(project, filesToProceed, missingFiles, progress);
+    if (!filesUploaded) { // no sense to proceed
+      dcLogger.logWarn("Files upload FAIL");
+      return EMPTY_MAP;
+    }
 
     // ---------------------------------------- Get Analysis
     final String bundleId = mapProject2BundleId.getOrDefault(project, "");
@@ -385,7 +392,7 @@ private List<String> createBundleStep(
   }
 
   /** Perform costly network request. <b>No cache checks!</b> */
-  private void uploadFilesStep(
+  private boolean uploadFilesStep(
       @NotNull Object project,
       @NotNull Collection<Object> filesToProceed,
       @NotNull List<String> missingFiles,
@@ -401,24 +408,26 @@ private void uploadFilesStep(
       dcLogger.logInfo("No missingFiles to Upload");
     } else {
       final int attempts = 5;
-      for (int counter = 0; counter < attempts; counter++) {
-        uploadFiles(project, filesToProceed, missingFiles, bundleId, progress);
-        missingFiles = checkBundle(project, bundleId);
-        if (missingFiles.isEmpty()) {
-          break;
-        } else {
+      int counter = 0;
+      while (!missingFiles.isEmpty() && counter < attempts) {
+        if (counter > 0) {
           dcLogger.logWarn(
               "Check Bundle found "
                   + missingFiles.size()
-                  + " missingFiles (NOT uploaded), will try to upload "
+                  + " missingFiles (NOT uploaded), will try to re-upload "
                   + (attempts - counter)
                   + " more times:\nmissingFiles = "
                   + missingFiles);
         }
+        uploadFiles(project, filesToProceed, missingFiles, bundleId, progress);
+        List<String> newMissingFiles = checkBundle(project, bundleId);
+        missingFiles = (newMissingFiles != null) ? newMissingFiles : missingFiles;
+        counter++;
       }
     }
     dcLogger.logInfo(
         "--- Upload Files took: " + (System.currentTimeMillis() - startTime) + " milliseconds");
+    return missingFiles.isEmpty();
   }
 
   private void uploadFiles(
@@ -471,14 +480,14 @@ private void uploadFiles(
   /**
    * Checks the status of a bundle: if there are still missing files after uploading
    *
-   * @return list of the current missingFiles.
+   * @return list of the current missingFiles or NULL if not succeed.
    */
-  @NotNull
+  @Nullable
   private List<String> checkBundle(@NotNull Object project, @NotNull String bundleId) {
     CreateBundleResponse checkBundleResponse =
         DeepCodeRestApi.checkBundle(deepCodeParams.getSessionToken(), bundleId);
     if (isNotSucceed(project, checkBundleResponse, "Bad CheckBundle request: ")) {
-      return Collections.emptyList();
+      return null;
     }
     return checkBundleResponse.getMissingFiles();
   }
@@ -568,8 +577,10 @@ private GetAnalysisResponse doGetAnalysis(
       List<String> filesToAnalyse) {
     GetAnalysisResponse response;
     int counter = 0;
+    int failWith404counts = 0;
     final long timeout = deepCodeParams.getTimeoutForGettingAnalysesMs();
     final long attempts = timeout / PlatformDependentUtilsBase.DEFAULT_DELAY;
+    final long endTime = System.currentTimeMillis() + timeout;
     do {
       if (counter > 0) pdUtils.delay(PlatformDependentUtilsBase.DEFAULT_DELAY, progress);
       response =
@@ -583,8 +594,15 @@ private GetAnalysisResponse doGetAnalysis(
 
       pdUtils.progressCheckCanceled(progress);
       dcLogger.logInfo(response.toString());
-      if (isNotSucceed(project, response, "Bad GetAnalysis request: "))
-        return new GetAnalysisResponse();
+      if (isNotSucceed(project, response, "Bad GetAnalysis request: ")) {
+        if (response.getStatusCode() != 404 || failWith404counts >= 5) {
+          return new GetAnalysisResponse();
+        } else {
+          failWith404counts++;
+        }
+      } else {
+        failWith404counts = 0;
+      }
 
       double responseProgress = response.getProgress();
       if (responseProgress <= 0 || responseProgress > 1) {
@@ -594,7 +612,7 @@ private GetAnalysisResponse doGetAnalysis(
       pdUtils.progressSetText(
           progress, WAITING_FOR_ANALYSIS_TEXT + (int) (responseProgress * 100) + "% done");
 
-      if (counter >= attempts) {
+      if (System.currentTimeMillis() >= endTime) {
         dcLogger.logWarn("Timeout expire for waiting analysis results.");
         pdUtils.showWarn(
             "Can't get analysis results from the server. Timeout of "