Fix CR issues

Author: georgii-borovinskikh-sonarsource

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/AnalysisCancellationService.java

@@ -20,15 +20,13 @@
 package org.sonarsource.sonarlint.visualstudio.roslyn;
 
 import org.sonar.api.Startable;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonarsource.api.sonarlint.SonarLintSide;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-@ScannerSide
 @SonarLintSide(lifespan = SonarLintSide.INSTANCE)
 public class AnalysisCancellationService implements Startable {
   private final ScheduledExecutorService scheduledExecutorService;

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/AnalysisTrackerImpl.java

@@ -36,18 +36,18 @@ public AnalysisTrackerImpl(SensorContext sensorContext, HttpAnalysisRequestHandl
     this.analysisId = UUID.randomUUID();
     analysisCancellationService.registerAnalysis(this);
   }
-  
+
   @Override
   public UUID getAnalysisId() {
     return analysisId;
   }
 
   @Override
   public synchronized boolean cancelIfNeeded() {
-    if (isCompleted){
+    if (isCompleted) {
       return true;
     }
-    
+
     if (sensorContext.isCancelled()) {
       handler.cancelAnalysis(analysisId);
       setCompletedState();

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/RemoteAnalysisService.java

@@ -20,7 +20,6 @@
 package org.sonarsource.sonarlint.visualstudio.roslyn;
 
 import org.sonar.api.batch.rule.ActiveRule;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonarsource.api.sonarlint.SonarLintSide;
 import org.sonarsource.sonarlint.visualstudio.roslyn.http.AnalyzerInfoDto;
@@ -30,11 +29,6 @@
 import java.util.Collection;
 import java.util.Map;
 
-/**
- * Factory for creating AnalysisManager instances.
- * This class has instance-based scope in SonarLint.
- */
-@ScannerSide
 @SonarLintSide
 public class RemoteAnalysisService {
 

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/http/HttpAnalysisRequestHandler.java

@@ -27,20 +27,18 @@
 import java.util.UUID;
 
 import org.sonar.api.batch.rule.ActiveRule;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonarsource.api.sonarlint.SonarLintSide;
 import org.sonarsource.sonarlint.visualstudio.roslyn.protocol.RoslynIssue;
 
-@ScannerSide
 @SonarLintSide
 public class HttpAnalysisRequestHandler {
   private static final Logger LOG = Loggers.get(HttpAnalysisRequestHandler.class);
-  private final HttpClientHandler httpClientFactory;
+  private final HttpClientHandler httpClientHandler;
 
-  public HttpAnalysisRequestHandler(HttpClientHandler httpClientFactory) {
-    this.httpClientFactory = httpClientFactory;
+  public HttpAnalysisRequestHandler(HttpClientHandler httpClientHandler) {
+    this.httpClientHandler = httpClientHandler;
   }
 
   public Collection<RoslynIssue> analyze(
@@ -51,7 +49,7 @@ public Collection<RoslynIssue> analyze(
     UUID analysisId) {
     Collection<RoslynIssue> roslynIssues = new ArrayList<>();
     try {
-      var response = httpClientFactory.sendAnalyzeRequest(fileNames, activeRules, analysisProperties, analyzerInfo, analysisId);
+      var response = httpClientHandler.sendAnalyzeRequest(fileNames, activeRules, analysisProperties, analyzerInfo, analysisId);
       if (response.statusCode() != HttpURLConnection.HTTP_OK) {
         LOG.error("Response from server is {}.", response.statusCode());
         return roslynIssues;
@@ -75,13 +73,13 @@ public Collection<RoslynIssue> analyze(
   }
 
   public void cancelAnalysis(UUID analysisId) {
-    var requestFuture = httpClientFactory.sendCancelRequest(analysisId);
+    var requestFuture = httpClientHandler.sendCancelRequest(analysisId);
 
     requestFuture.exceptionally(e -> {
       LOG.error("Failed to cancel analysis due to: {}", e.getMessage(), e);
       return null;
     }).thenApply(response -> {
-      if (response.statusCode() != HttpURLConnection.HTTP_OK) {
+      if (response != null && response.statusCode() != HttpURLConnection.HTTP_OK) {
         LOG.error("Response from cancel request is {}.", response.statusCode());
       }
       return null;

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/http/HttpClientHandler.java

@@ -30,11 +30,9 @@
 
 import org.sonar.api.batch.rule.ActiveRule;
 import org.sonar.api.batch.sensor.SensorContext;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonarsource.api.sonarlint.SonarLintSide;
 import org.sonarsource.sonarlint.visualstudio.roslyn.SqvsRoslynPluginPropertyDefinitions;
 
-@ScannerSide
 @SonarLintSide
 public class HttpClientHandler {
   private final SensorContext context;

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/http/HttpClientProvider.java

@@ -19,12 +19,10 @@
  */
 package org.sonarsource.sonarlint.visualstudio.roslyn.http;
 
-import org.sonar.api.scanner.ScannerSide;
 import org.sonarsource.api.sonarlint.SonarLintSide;
 
 import java.net.http.HttpClient;
 
-@ScannerSide
 @SonarLintSide(lifespan = SonarLintSide.INSTANCE)
 public class HttpClientProvider {
 

sonarqube-ide-visualstudio-roslyn-plugin/src/main/java/org/sonarsource/sonarlint/visualstudio/roslyn/http/JsonRequestBuilder.java

@@ -25,12 +25,10 @@
 import java.util.UUID;
 
 import org.sonar.api.batch.rule.ActiveRule;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonarsource.api.sonarlint.SonarLintSide;
 
-@ScannerSide
 @SonarLintSide(lifespan = "INSTANCE")
 public class JsonRequestBuilder {
   private static final Logger LOG = Loggers.get(JsonRequestBuilder.class);

sonarqube-ide-visualstudio-roslyn-plugin/src/test/java/org/sonarsource/sonarlint/visualstudio/roslyn/http/HttpClientProviderTest.java

@@ -46,4 +46,4 @@ void getHttpClient_httpClientInstanceIsNotStatic() {
 
     assertThat(httpClient1).isNotNull().isNotSameAs(httpClient2);
   }
-}
+}