JS-751 Fix SQ issues (#5438)

Author: vdiez

sonar-plugin/bridge/src/main/java/org/sonar/plugins/javascript/bridge/AstProtoUtils.java

@@ -18,8 +18,6 @@
 
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.InvalidProtocolBufferException;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Base64;
 import org.slf4j.Logger;

sonar-plugin/bridge/src/main/java/org/sonar/plugins/javascript/bridge/BridgeServer.java

@@ -36,7 +36,7 @@
 @ScannerSide
 @SonarLintSide(lifespan = INSTANCE)
 public interface BridgeServer extends Startable {
-  void startServerLazily(BridgeServerConfig context) throws IOException, InterruptedException;
+  void startServerLazily(BridgeServerConfig context) throws IOException;
 
   void initLinter(
     List<EslintRule> rules,

sonar-plugin/bridge/src/main/java/org/sonar/plugins/javascript/bridge/BridgeServerImpl.java

@@ -309,8 +309,7 @@ private static Map<String, String> getEnv() {
   }
 
   @Override
-  public void startServerLazily(BridgeServerConfig serverConfig)
-    throws IOException, InterruptedException {
+  public void startServerLazily(BridgeServerConfig serverConfig) throws IOException {
     if (status == Status.FAILED) {
       if (shouldRestartFailedServer()) {
         // Reset the status, which will cause the server to retry deployment

sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/analysis/HtmlSensor.java

@@ -17,7 +17,6 @@
 package org.sonar.plugins.javascript.analysis;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.StreamSupport;

sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/analysis/JsTsSensor.java

@@ -147,7 +147,7 @@ protected void analyzeFiles(List<InputFile> inputFiles) throws IOException {
     }
   }
 
-  class AnalyzeProjectHandler implements WebSocketMessageHandler {
+  class AnalyzeProjectHandler implements WebSocketMessageHandler<ProjectAnalysisRequest> {
 
     private final JsTsContext<?> context;
     private final Map<String, List<ExternalIssue>> externalIssues;
@@ -231,42 +231,35 @@ public CompletableFuture<Void> getFuture() {
     @Override
     public void handleMessage(JsonObject jsonObject) {
       var messageType = jsonObject.get("messageType").getAsString();
-      switch (messageType) {
-        case "fileResult":
-          var filePath = jsonObject.get("filename").getAsString();
-          var response = BridgeServer.AnalysisResponse.fromDTO(
-            GSON.fromJson(jsonObject, BridgeServer.AnalysisResponseDTO.class)
-          );
-          var file = fileToInputFile.get(filePath);
-          var cacheStrategy = fileToCacheStrategy.get(filePath);
-          var issues = analysisProcessor.processResponse(context, checks, file, response);
-          var dedupedIssues = ExternalIssueRepository.deduplicateIssues(
-            externalIssues.get(filePath),
-            issues
+      if ("fileResult".equals(messageType)) {
+        var filePath = jsonObject.get("filename").getAsString();
+        var response = BridgeServer.AnalysisResponse.fromDTO(
+          GSON.fromJson(jsonObject, BridgeServer.AnalysisResponseDTO.class)
+        );
+        var file = fileToInputFile.get(filePath);
+        var cacheStrategy = fileToCacheStrategy.get(filePath);
+        var issues = analysisProcessor.processResponse(context, checks, file, response);
+        var dedupedIssues = ExternalIssueRepository.deduplicateIssues(
+          externalIssues.get(filePath),
+          issues
+        );
+        if (!dedupedIssues.isEmpty()) {
+          ExternalIssueRepository.saveESLintIssues(context.getSensorContext(), dedupedIssues);
+        }
+        externalIssues.remove(filePath);
+        try {
+          cacheStrategy.writeAnalysisToCache(
+            CacheAnalysis.fromResponse(response.ucfgPaths(), response.cpdTokens(), response.ast()),
+            file
           );
-          if (!dedupedIssues.isEmpty()) {
-            ExternalIssueRepository.saveESLintIssues(context.getSensorContext(), dedupedIssues);
-          }
-          externalIssues.remove(filePath);
-          try {
-            cacheStrategy.writeAnalysisToCache(
-              CacheAnalysis.fromResponse(
-                response.ucfgPaths(),
-                response.cpdTokens(),
-                response.ast()
-              ),
-              file
-            );
-          } catch (IOException e) {
-            handle.completeExceptionally(new IllegalStateException(e));
-          }
-          acceptAstResponse(response.ast(), file);
-          break;
-        case "meta":
-          var meta = GSON.fromJson(jsonObject, BridgeServer.ProjectAnalysisMetaResponse.class);
-          meta.warnings().forEach(analysisWarnings::addUnique);
-          handle.complete(null);
-          break;
+        } catch (IOException e) {
+          handle.completeExceptionally(new IllegalStateException(e));
+        }
+        acceptAstResponse(response.ast(), file);
+      } else if ("meta".equals(messageType)) {
+        var meta = GSON.fromJson(jsonObject, BridgeServer.ProjectAnalysisMetaResponse.class);
+        meta.warnings().forEach(analysisWarnings::addUnique);
+        handle.complete(null);
       }
     }
 

sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/analysis/YamlSensor.java

@@ -34,7 +34,6 @@
 import org.sonar.plugins.javascript.CancellationException;
 import org.sonar.plugins.javascript.analysis.cache.CacheAnalysis;
 import org.sonar.plugins.javascript.analysis.cache.CacheStrategies;
-import org.sonar.plugins.javascript.bridge.AnalysisWarningsWrapper;
 import org.sonar.plugins.javascript.bridge.BridgeServer;
 import org.sonar.plugins.javascript.bridge.BridgeServer.JsAnalysisRequest;
 import org.sonar.plugins.javascript.utils.ProgressReport;