fix: shard uniq calculation per Project and actual use of shard in getAnalysis API call

Author: ArtsiomCh

src/integTest/java/ai/deepcode/javaclient/DeepCodeRestApiTest.java

@@ -370,11 +370,7 @@ private GetAnalysisResponse doAnalysisAndWait(List<String> analysedFiles, Intege
       throws InterruptedException {
     GetAnalysisResponse response = null;
     for (int i = 0; i < 120; i++) {
-      try {
-        response = DeepCodeRestApi.getAnalysis(loggedToken, bundleId, severity, analysedFiles, getHash(bundleId));
-      } catch (NoSuchAlgorithmException e) {
-        throw new RuntimeException(e);
-      }
+      response = DeepCodeRestApi.getAnalysis(loggedToken, bundleId, severity, analysedFiles, bundleId);
       if (response.getStatus().equals("COMPLETE")) break;
       Thread.sleep(1000);
     }

src/main/java/ai/deepcode/javaclient/DeepCodeRestApi.java

@@ -343,7 +343,7 @@ public static GetAnalysisResponse getAnalysis(
     try {
       Response<GetAnalysisResponse> retrofitResponse =
           getAnalysisCall
-              .doGetAnalysis(token, new GetAnalysisRequest(bundleId, filesToAnalyse, severity))
+              .doGetAnalysis(token, new GetAnalysisRequest(bundleId, filesToAnalyse, severity, shard))
               .execute();
       GetAnalysisResponse result = retrofitResponse.body();
       if (result == null) result = new GetAnalysisResponse();

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

@@ -577,7 +577,9 @@ private GetAnalysisResponse doGetAnalysis(
               deepCodeParams.getSessionToken(),
               bundleId,
               deepCodeParams.getMinSeverity(),
-              filesToAnalyse, HashContentUtilsBase.doGetHash(pdUtils.getFilePath(project)));
+              filesToAnalyse,
+              HashContentUtilsBase.calculateHash(project.toString())
+          );
 
       pdUtils.progressCheckCanceled(progress);
       dcLogger.logInfo(response.toString());

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

@@ -46,7 +46,7 @@ private static String bytesToHex(byte[] hash) {
   public boolean isHashChanged(@NotNull Object file) {
     // fixme debug only
     // DCLogger.getInstance().info("hash check started");
-    String newHash = doGetHash(doGetFileContent(file));
+    String newHash = calculateHash(doGetFileContent(file));
     String oldHash = mapFile2Hash.put(file, newHash);
     // fixme debug only
     /*
@@ -67,10 +67,10 @@ public String getHash(@NotNull Object file) {
   }
 
   private String doGetHash(@NotNull Object file) {
-    return doGetHash(getFileContent(file));
+    return calculateHash(getFileContent(file));
   }
 
-  protected static String doGetHash(@NotNull String plain) {
+  protected static String calculateHash(@NotNull String plain) {
     MessageDigest messageDigest;
     try {
       messageDigest = MessageDigest.getInstance("SHA-256");

src/main/java/ai/deepcode/javaclient/requests/GetAnalysisRequest.java

@@ -6,30 +6,33 @@
 public class GetAnalysisRequest {
   private GetAnalysisKey key;
   private Integer severity;
-  private boolean prioritized = false;
-  private boolean legacy = true;
+  private boolean prioritized;
+  private boolean legacy;
 
   /**
    * @param bundleHash
    * @param limitToFiles list of filePath
    * @param severity
+   * @param shard uniq String (hash) per Project to optimize jobs on backend (run on the same worker to reuse caches)
    * @param prioritized
    * @param legacy
    */
   public GetAnalysisRequest(
-      String bundleHash,
-      List<String> limitToFiles,
-      Integer severity,
-      boolean prioritized,
-      boolean legacy) {
-    this.key = new GetAnalysisKey(bundleHash, limitToFiles);
+    String bundleHash,
+    List<String> limitToFiles,
+    Integer severity,
+    String shard,
+    boolean prioritized,
+    boolean legacy
+  ) {
+    this.key = new GetAnalysisKey(bundleHash, limitToFiles, shard);
     this.severity = severity;
     this.prioritized = prioritized;
     this.legacy = legacy;
   }
 
-  public GetAnalysisRequest(String bundleHash, List<String> limitToFiles, Integer severity) {
-    this(bundleHash, limitToFiles, severity, false, true);
+  public GetAnalysisRequest(String bundleHash, List<String> limitToFiles, Integer severity, String shard) {
+    this(bundleHash, limitToFiles, severity, shard, false, true);
   }
 
   private static class GetAnalysisKey {
@@ -43,9 +46,6 @@ public GetAnalysisKey(String hash, List<String> limitToFiles, String shard) {
       this.limitToFiles = limitToFiles;
       this.shard = shard;
     }
-    public GetAnalysisKey(String hash, List<String> limitToFiles) {
-      this(hash, limitToFiles, hash);
-    }
 
     public String getHash() {
       return hash;