SLVSCODE-756 remove binding when connection is removed

Author: sophio-japharidze-sonarsource

src/main/java/org/sonarsource/sonarlint/ls/SonarLintExtendedLanguageClient.java

@@ -72,6 +72,9 @@ public interface SonarLintExtendedLanguageClient extends LanguageClient {
   @JsonNotification("sonarlint/openConnectionSettings")
   void openConnectionSettings(boolean isSonarCloud);
 
+  @JsonNotification("sonarlint/removeBindingsForDeletedConnections")
+  void removeBindingsForDeletedConnections(List<String> connectionIds);
+
   @JsonRequest("sonarlint/assistCreatingConnection")
   CompletableFuture<AssistCreatingConnectionResponse> assistCreatingConnection(CreateConnectionParams params);
 

src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java

@@ -398,7 +398,6 @@ private static TextDocumentSyncOptions getTextDocumentSyncOptions() {
   @Override
   public CompletableFuture<Object> shutdown() {
     List.<Runnable>of(
-        // prevent creation of new engines
         analysisScheduler::shutdown,
         branchManager::shutdown,
         settingsManager::shutdown,

src/main/java/org/sonarsource/sonarlint/ls/connected/ProjectBindingManager.java

@@ -37,7 +37,6 @@
 import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonarsource.sonarlint.core.client.legacy.analysis.SonarLintAnalysisEngine;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.config.binding.BindingConfigurationDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.config.binding.DidUpdateBindingParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.common.TransientSonarCloudConnectionDto;
@@ -85,7 +84,6 @@ public class ProjectBindingManager implements WorkspaceSettingsChangeListener, W
   private final ConcurrentMap<URI, Optional<ProjectBinding>> folderBindingCache;
   private final LanguageClientLogger globalLogOutput;
   private final ConcurrentMap<URI, Optional<ProjectBinding>> fileBindingCache = new ConcurrentHashMap<>();
-  private final ConcurrentMap<String, Optional<SonarLintAnalysisEngine>> connectedEngineCacheByConnectionId;
   private final SonarLintExtendedLanguageClient client;
   private AnalysisScheduler analysisManager;
   private final BackendServiceFacade backendServiceFacade;
@@ -94,20 +92,18 @@ public class ProjectBindingManager implements WorkspaceSettingsChangeListener, W
 
   public ProjectBindingManager(WorkspaceFoldersManager foldersManager, SettingsManager settingsManager, SonarLintExtendedLanguageClient client,
     LanguageClientLogger globalLogOutput, BackendServiceFacade backendServiceFacade, OpenNotebooksCache openNotebooksCache, OpenFilesCache openFilesCache) {
-    this(foldersManager, settingsManager, client, new ConcurrentHashMap<>(), globalLogOutput, new ConcurrentHashMap<>(),
+    this(foldersManager, settingsManager, client, new ConcurrentHashMap<>(), globalLogOutput,
       backendServiceFacade, openNotebooksCache, openFilesCache);
   }
 
   public ProjectBindingManager(WorkspaceFoldersManager foldersManager, SettingsManager settingsManager, SonarLintExtendedLanguageClient client,
-    ConcurrentMap<URI, Optional<ProjectBinding>> folderBindingCache, LanguageClientLogger globalLogOutput,
-    ConcurrentMap<String, Optional<SonarLintAnalysisEngine>> connectedEngineCacheByConnectionId, BackendServiceFacade backendServiceFacade,
+    ConcurrentMap<URI, Optional<ProjectBinding>> folderBindingCache, LanguageClientLogger globalLogOutput, BackendServiceFacade backendServiceFacade,
     OpenNotebooksCache openNotebooksCache, OpenFilesCache openFilesCache) {
     this.foldersManager = foldersManager;
     this.settingsManager = settingsManager;
     this.client = client;
     this.folderBindingCache = folderBindingCache;
     this.globalLogOutput = globalLogOutput;
-    this.connectedEngineCacheByConnectionId = connectedEngineCacheByConnectionId;
     this.backendServiceFacade = backendServiceFacade;
     this.openNotebooksCache = openNotebooksCache;
     this.openFilesCache = openFilesCache;
@@ -309,6 +305,13 @@ private void clearCaches(String connectionId) {
 
   @Override
   public void onChange(@CheckForNull WorkspaceSettings oldValue, WorkspaceSettings newValue) {
+    if (oldValue != null && oldValue.getServerConnections().size() > newValue.getServerConnections().size()) {
+      // connection(s) were deleted
+      var deletedConnections = oldValue.getServerConnections().keySet().stream()
+        .filter(id -> !newValue.getServerConnections().containsKey(id))
+        .toList();
+      client.removeBindingsForDeletedConnections(deletedConnections);
+    }
     newValue.getServerConnections().forEach((id, value) -> {
       if (oldValue == null) {
         // initial sync

src/main/java/org/sonarsource/sonarlint/ls/settings/SettingsManager.java

@@ -507,18 +507,10 @@ public void addListener(WorkspaceSettingsChangeListener listener) {
     globalListeners.add(listener);
   }
 
-  public void removeListener(WorkspaceSettingsChangeListener listener) {
-    globalListeners.remove(listener);
-  }
-
   public void addListener(WorkspaceFolderSettingsChangeListener listener) {
     folderListeners.add(listener);
   }
 
-  public void removeListener(WorkspaceFolderSettingsChangeListener listener) {
-    folderListeners.remove(listener);
-  }
-
   @Override
   public void added(WorkspaceFolderWrapper added) {
     executor.execute(() -> updateWorkspaceFolderSettings(added, false));

src/test/java/org/sonarsource/sonarlint/ls/connected/ProjectBindingManagerTests.java

@@ -141,12 +141,11 @@ public void prepare() throws IOException, ExecutionException, InterruptedExcepti
     when(client.getTokenForServer(any())).thenReturn(CompletableFuture.supplyAsync(() -> "token"));
 
     folderBindingCache = new ConcurrentHashMap<>();
-    connectedEngineCacheByConnectionId = new ConcurrentHashMap<>();
 
     when(openNotebooksCache.getFile(any(URI.class))).thenReturn(Optional.empty());
 
     underTest = new ProjectBindingManager(foldersManager, settingsManager, client, folderBindingCache, logTester.getLogger(),
-      connectedEngineCacheByConnectionId, backendServiceFacade, openNotebooksCache, openFilesCache);
+      backendServiceFacade, openNotebooksCache, openFilesCache);
     underTest.setAnalysisManager(analysisManager);
   }
 

src/test/java/org/sonarsource/sonarlint/ls/mediumtests/AbstractLanguageServerMediumTests.java

@@ -543,6 +543,11 @@ public void browseTo(String link) {
     public void openConnectionSettings(boolean isSonarCloud) {
     }
 
+    @Override
+    public void removeBindingsForDeletedConnections(List<String> connectionIds) {
+
+    }
+
     @Override
     public CompletableFuture<AssistCreatingConnectionResponse> assistCreatingConnection(CreateConnectionParams params) {
       return CompletableFuture.completedFuture(new AssistCreatingConnectionResponse("connectionId"));
@@ -572,6 +577,7 @@ public void reportConnectionCheckResult(ConnectionCheckResult result) {
     public CompletableFuture<String> getTokenForServer(String serverId) {
       return CompletableFutures.computeAsync(server -> "token");
     }
+
   }
 
   protected static void notifyConfigurationChangeOnClient() {

src/test/java/org/sonarsource/sonarlint/ls/mediumtests/ConnectedModeMediumTests.java

@@ -499,7 +499,7 @@ void analysisConnected_scan_all_hotspot_then_forget() {
 
   @Test
   void analysisConnected_no_matching_server_issues() {
-    mockWebServerExtension.addStringResponse("/api/system/status", "{\"status\": \"UP\", \"version\": \"9.7\", \"id\": \"xzy\"}");
+    mockWebServerExtension.addStringResponse("/api/system/status", "{\"status\": \"UP\", \"version\": \"9.9\", \"id\": \"xzy\"}");
     mockNoIssuesNoHotspotsForProject();
     mockWebServerExtension.addStringResponse("/api/authentication/validate?format=json", "{\"valid\": true}");
     mockWebServerExtension.addProtobufResponseDelimited(
@@ -1235,7 +1235,7 @@ private void mockNoIssueAndNoTaintInIncrementalSync() {
   }
 
   private void mockNoIssuesNoHotspotsForProject() {
-    mockWebServerExtension.addStringResponse("/api/system/status", "{\"status\": \"UP\", \"version\": \"9.7\", \"id\": \"xzy\"}");
+    mockWebServerExtension.addStringResponse("/api/system/status", "{\"status\": \"UP\", \"version\": \"9.9\", \"id\": \"xzy\"}");
     mockWebServerExtension.addProtobufResponseDelimited(
       "/api/issues/pull?projectKey=myProject&branchName=master&languages=" + LANGUAGES_LIST,
       Issues.IssuesPullQueryTimestamp.newBuilder()