SLCORE-968 add client method to check if branches match

SonarSource · Oct 7, 2024 · 756d3f1 · 756d3f1
1 parent 074e1ae
commit 756d3f1
Show file tree

Hide file tree

Showing 40 changed files with 163 additions and 48 deletions.
diff --git a/API_CHANGES.md b/API_CHANGES.md
@@ -1,3 +1,9 @@
+# 10.7.1
+
+## Breaking changes
+
+* Add a new method to `org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcClient#matchProjectBranch` allowing the backend to check whether the locally checked-out branch matches a requesting server branch
+
 # 10.7
 
 ## Breaking changes

diff --git a/backend/analysis-engine/pom.xml b/backend/analysis-engine/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-analysis-engine</artifactId>

diff --git a/backend/cli/pom.xml b/backend/cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-backend-cli</artifactId>

diff --git a/backend/commons/pom.xml b/backend/commons/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-commons</artifactId>

diff --git a/backend/core/pom.xml b/backend/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-core</artifactId>

diff --git a/...rc/main/java/org/sonarsource/sonarlint/core/branch/SonarProjectBranchTrackingService.java b/...rc/main/java/org/sonarsource/sonarlint/core/branch/SonarProjectBranchTrackingService.java
@@ -156,11 +156,6 @@ private String matchSonarProjectBranch(String configurationScopeId, SonarLintCan
     return matchedSonarBranch;
   }
 
-  @CheckForNull
-  public String getMatchedSonarProjectBranch(String configurationScopeId) {
-    return cachedMatchingBranchByConfigScope.get(configurationScopeId);
-  }
-
   @CheckForNull
   private String requestClientToMatchSonarProjectBranch(String configurationScopeId, String mainSonarBranchName, Set<String> allSonarBranchesNames,
     SonarLintCancelMonitor cancelMonitor) {

diff --git a/.../java/org/sonarsource/sonarlint/core/embedded/server/ShowFixSuggestionRequestHandler.java b/.../java/org/sonarsource/sonarlint/core/embedded/server/ShowFixSuggestionRequestHandler.java
@@ -51,6 +51,7 @@
 import org.sonarsource.sonarlint.core.file.PathTranslationService;
 import org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcClient;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.InitializeParams;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.MatchProjectBranchParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.connection.AssistCreatingConnectionParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.connection.SonarCloudConnectionParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.connection.SonarQubeConnectionParams;
@@ -112,10 +113,10 @@ public void handle(ClassicHttpRequest request, ClassicHttpResponse response, Htt
       showFixSuggestionQuery.projectKey,
       (connectionId, configScopeId, cancelMonitor) -> {
         if (configScopeId != null) {
-          var matchingBranch = branchTrackingService.getMatchedSonarProjectBranch(configScopeId);
-          if (matchingBranch != null && !matchingBranch.equals(showFixSuggestionQuery.branch)) {
+          var localBranchMatchesRequesting = client.matchProjectBranch(new MatchProjectBranchParams(configScopeId, showFixSuggestionQuery.branch)).join().isBranchMatched();
+          if (!localBranchMatchesRequesting) {
             client.showMessage(new ShowMessageParams(MessageType.ERROR, "Attempted to show a fix suggestion for a different branch than the one currently checked out." +
-              "\nPlease check out the correct branch and try again."));
+              "\nPlease make sure the correct branch is checked out and try again."));
             return;
           }
           showFixSuggestionForScope(configScopeId, showFixSuggestionQuery.issueKey, showFixSuggestionQuery.fixSuggestion);

diff --git a/.../org/sonarsource/sonarlint/core/embedded/server/ShowFixSuggestionRequestHandlerTests.java b/.../org/sonarsource/sonarlint/core/embedded/server/ShowFixSuggestionRequestHandlerTests.java
@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -49,6 +50,7 @@
 import org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcClient;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.FeatureFlagsDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.InitializeParams;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.MatchProjectBranchResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.message.MessageType;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.message.ShowMessageParams;
 import org.sonarsource.sonarlint.core.telemetry.TelemetryService;
@@ -247,16 +249,16 @@ void should_cancel_flow_when_branch_does_not_match() throws HttpException, IOExc
     when(connectionConfigurationRepository.findByOrganization(any())).thenReturn(List.of(
       new SonarCloudConnectionConfiguration(PRODUCTION_URI, "name", "organizationKey", false)));
     when(configurationRepository.getBoundScopesToConnectionAndSonarProject(any(), any())).thenReturn(List.of(new BoundScope("configScope", "connectionId", "projectKey")));
-    when(sonarProjectBranchTrackingService.getMatchedSonarProjectBranch(any())).thenReturn("branch");
-    when(sonarProjectBranchTrackingService.getMatchedSonarProjectBranch(any())).thenReturn("anotherBranch");
+    when(sonarLintRpcClient.matchProjectBranch(any())).thenReturn(CompletableFuture.completedFuture(new MatchProjectBranchResponse(false)));
 
     showFixSuggestionRequestHandler.handle(request, response, context);
     var showMessageArgumentCaptor = ArgumentCaptor.forClass(ShowMessageParams.class);
 
     await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> verify(sonarLintRpcClient).showMessage(showMessageArgumentCaptor.capture()));
     assertThat(showMessageArgumentCaptor.getValue().getType()).isEqualTo(MessageType.ERROR);
-    assertThat(showMessageArgumentCaptor.getValue().getText()).isEqualTo("Attempted to show a fix suggestion for a different branch than the one currently checked out." +
-      "\nPlease check out the correct branch and try again.");
+    assertThat(showMessageArgumentCaptor.getValue().getText()).isEqualTo("Attempted to show a fix suggestion for a different branch than the one currently checked out.\n" +
+      "Please make sure the correct branch is checked out and try again.");
+    verify(sonarLintRpcClient).matchProjectBranch(any());
     verifyNoMoreInteractions(sonarLintRpcClient);
   }
 

diff --git a/backend/http/pom.xml b/backend/http/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-http</artifactId>

diff --git a/backend/plugin-api/pom.xml b/backend/plugin-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-plugin-api</artifactId>

diff --git a/backend/plugin-commons/pom.xml b/backend/plugin-commons/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-plugin-commons</artifactId>

diff --git a/backend/rpc-impl/pom.xml b/backend/rpc-impl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-rpc-impl</artifactId>

diff --git a/backend/rule-extractor/pom.xml b/backend/rule-extractor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-rule-extractor</artifactId>

diff --git a/backend/server-api/pom.xml b/backend/server-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-server-api</artifactId>

diff --git a/backend/server-connection/pom.xml b/backend/server-connection/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-server-connection</artifactId>

diff --git a/backend/slf4j-sonar-log/pom.xml b/backend/slf4j-sonar-log/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-slf4j-sonar-log</artifactId>

diff --git a/backend/telemetry/pom.xml b/backend/telemetry/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-telemetry</artifactId>

diff --git a/buildSrc/maven-shade-ext-bnd-transformer/pom.xml b/buildSrc/maven-shade-ext-bnd-transformer/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>maven-shade-ext-bnd-transformer</artifactId>

diff --git a/client/java-client-dependencies/pom.xml b/client/java-client-dependencies/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-java-client-dependencies</artifactId>

diff --git a/client/java-client-legacy/pom.xml b/client/java-client-legacy/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-java-client-legacy</artifactId>

diff --git a/client/java-client-osgi/pom.xml b/client/java-client-osgi/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-java-client-osgi</artifactId>

diff --git a/client/java-client-utils/pom.xml b/client/java-client-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-java-client-utils</artifactId>

diff --git a/client/rpc-java-client/pom.xml b/client/rpc-java-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-rpc-java-client</artifactId>

diff --git a/...t/src/main/java/org/sonarsource/sonarlint/core/rpc/client/SonarLintRpcClientDelegate.java b/...t/src/main/java/org/sonarsource/sonarlint/core/rpc/client/SonarLintRpcClientDelegate.java
@@ -169,6 +169,8 @@ default void showFixSuggestion(String configurationScopeId, String issueKey, Fix
   String matchSonarProjectBranch(String configurationScopeId, String mainBranchName, Set<String> allBranchesNames,
     SonarLintCancelChecker cancelChecker) throws ConfigScopeNotFoundException;
 
+  boolean matchProjectBranch(String configurationScopeId, String branchNameToMatch, SonarLintCancelChecker cancelChecker) throws ConfigScopeNotFoundException;
+
   void didChangeMatchedSonarProjectBranch(String configScopeId, String newMatchedBranchName);
 
   TelemetryClientLiveAttributesResponse getTelemetryLiveAttributes();

diff --git a/...lient/src/main/java/org/sonarsource/sonarlint/core/rpc/client/SonarLintRpcClientImpl.java b/...lient/src/main/java/org/sonarsource/sonarlint/core/rpc/client/SonarLintRpcClientImpl.java
@@ -39,15 +39,17 @@
 import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.DidChangeAnalysisReadinessParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.DidDetectSecretParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.DidRaiseIssueParams;
-import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.GetInferredAnalysisPropertiesParams;
-import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.GetInferredAnalysisPropertiesResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.GetFileExclusionsParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.GetFileExclusionsResponse;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.GetInferredAnalysisPropertiesParams;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.analysis.GetInferredAnalysisPropertiesResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.binding.AssistBindingParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.binding.AssistBindingResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.binding.NoBindingSuggestionFoundParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.binding.SuggestBindingParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.DidChangeMatchedSonarProjectBranchParams;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.MatchProjectBranchParams;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.MatchProjectBranchResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.MatchSonarProjectBranchParams;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.branch.MatchSonarProjectBranchResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.connection.AssistCreatingConnectionParams;
@@ -311,6 +313,18 @@ public CompletableFuture<MatchSonarProjectBranchResponse> matchSonarProjectBranc
     });
   }
 
+  @Override
+  public CompletableFuture<MatchProjectBranchResponse> matchProjectBranch(MatchProjectBranchParams params) {
+    return requestAsync(cancelChecker -> {
+      try {
+        return new MatchProjectBranchResponse(
+          delegate.matchProjectBranch(params.getConfigurationScopeId(), params.getServerBranchToMatch(), new SonarLintCancelChecker(cancelChecker)));
+      } catch (ConfigScopeNotFoundException e) {
+        throw configScopeNotFoundError(params.getConfigurationScopeId());
+      }
+    });
+  }
+
   @Override
   public void didChangeMatchedSonarProjectBranch(DidChangeMatchedSonarProjectBranchParams params) {
     notify(() -> delegate.didChangeMatchedSonarProjectBranch(params.getConfigScopeId(), params.getNewMatchedBranchName()));

diff --git a/its/plugins/custom-sensor-plugin/pom.xml b/its/plugins/custom-sensor-plugin/pom.xml
@@ -5,14 +5,14 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-its</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.sonarsource.plugins.example</groupId>
   <artifactId>custom-sensor-plugin</artifactId>
   <packaging>sonar-plugin</packaging>
-  <version>10.7-SNAPSHOT</version>
+  <version>10.7.1-SNAPSHOT</version>
 
   <name>Example Plugin for SonarQube</name>
   <description>Example of plugin for SonarQube</description>

diff --git a/its/plugins/global-extension-plugin/pom.xml b/its/plugins/global-extension-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-its</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/its/plugins/java-custom-rules/pom.xml b/its/plugins/java-custom-rules/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-its</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/its/pom.xml b/its/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
   </parent>
   <artifactId>sonarlint-core-its</artifactId>
   <name>SonarLint Core - ITs</name>

diff --git a/its/tests/pom.xml b/its/tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-its</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
   </parent>
   <artifactId>sonarlint-core-its-tests</artifactId>
   <name>SonarLint Core - ITs - Tests</name>

diff --git a/its/tests/src/test/java/its/MockSonarLintRpcClientDelegate.java b/its/tests/src/test/java/its/MockSonarLintRpcClientDelegate.java
@@ -189,6 +189,10 @@ public String matchSonarProjectBranch(String configurationScopeId, String mainBr
     return mainBranchName;
   }
 
+  public boolean matchProjectBranch(String configurationScopeId, String branchNameToMatch, SonarLintCancelChecker cancelChecker) throws ConfigScopeNotFoundException {
+    return true;
+  }
+
   @Override
   public void didChangeMatchedSonarProjectBranch(String configScopeId, String newMatchedBranchName) {
 

diff --git a/medium-tests/pom.xml b/medium-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.7-SNAPSHOT</version>
+    <version>10.7.1-SNAPSHOT</version>
   </parent>
   <artifactId>sonarlint-medium-tests</artifactId>
   <name>SonarLint Core - Medium Tests</name>

diff --git a/medium-tests/src/test/java/mediumtest/fixtures/SonarLintBackendFixture.java b/medium-tests/src/test/java/mediumtest/fixtures/SonarLintBackendFixture.java
@@ -726,6 +726,11 @@ public String matchSonarProjectBranch(String configurationScopeId, String mainBr
       return mainBranchName;
     }
 
+    @Override
+    public boolean matchProjectBranch(String configurationScopeId, String branchNameToMatch, SonarLintCancelChecker cancelChecker) throws ConfigScopeNotFoundException {
+      return true;
+    }
+
     @Override
     public void didChangeMatchedSonarProjectBranch(String configScopeId, String newMatchedBranchName) {