Update to released SLCORE

Author: damien-urruty-sonarsource

pom.xml

@@ -24,7 +24,7 @@
 
   <properties>
     <jdk.min.version>17</jdk.min.version>
-    <sonarlint.core.version>10.23.0.81260</sonarlint.core.version>
+    <sonarlint.core.version>10.23.0.81306</sonarlint.core.version>
     <slf4j.version>2.0.17</slf4j.version>
     <!-- Version used by Xodus -->
     <kotlin.version>1.6.10</kotlin.version>

src/main/java/org/sonarsource/sonarlint/ls/clientapi/SonarLintVSCodeClient.java

@@ -57,7 +57,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.sonarsource.sonarlint.core.commons.HotspotReviewStatus;
 import org.sonarsource.sonarlint.core.commons.SonarLintUserHome;
-import org.sonarsource.sonarlint.core.rpc.client.ConfigScopeNotFoundException;
 import org.sonarsource.sonarlint.core.rpc.client.SonarLintCancelChecker;
 import org.sonarsource.sonarlint.core.rpc.client.SonarLintRpcClientDelegate;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.config.binding.BindingSuggestionDto;
@@ -395,11 +394,6 @@ public String matchSonarProjectBranch(String configurationScopeId, String mainBr
     return branchManager.matchSonarProjectBranch(configurationScopeId, mainBranchName, allBranchesNames, cancelChecker);
   }
 
-  @Override
-  public boolean matchProjectBranch(String configurationScopeId, String branchNameToMatch, SonarLintCancelChecker cancelChecker) throws ConfigScopeNotFoundException {
-    return branchManager.matchProjectBranch(configurationScopeId, branchNameToMatch, cancelChecker);
-  }
-
   @Override
   public void didChangeMatchedSonarProjectBranch(String configScopeId, String newMatchedBranchName) {
     client.setReferenceBranchNameForFolder(SonarLintExtendedLanguageClient.ReferenceBranchForFolder.of(configScopeId,

src/main/java/org/sonarsource/sonarlint/ls/folders/WorkspaceFolderBranchManager.java

@@ -72,9 +72,4 @@ public String matchSonarProjectBranch(String folderUri, String mainBranchName, S
     }
     return electedBranchName;
   }
-
-  public boolean matchProjectBranch(String folderUri, String branchNameToMatch, SonarLintCancelChecker cancelChecker) {
-    if (cancelChecker.isCanceled()) return false;
-    return GitUtils.isCurrentBranch(folderUri, branchNameToMatch, logOutput);
-  }
 }

src/main/java/org/sonarsource/sonarlint/ls/util/GitUtils.java

@@ -20,9 +20,7 @@
 package org.sonarsource.sonarlint.ls.util;
 
 import java.io.IOException;
-import java.net.URI;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -111,19 +109,6 @@ public static String electBestMatchingServerBranchForCurrentHead(Repository repo
     }
   }
 
-  public static boolean isCurrentBranch(String folderUri, String expectedBranch, LanguageClientLogger logOutput) {
-    var repo = GitUtils.getRepositoryForDir(Paths.get(URI.create(folderUri)), logOutput);
-    if (repo == null) {
-      return false;
-    }
-    try {
-      var branch = repo.getBranch();
-      return branch != null && branch.equals(expectedBranch);
-    } catch (IOException e) {
-      return false;
-    }
-  }
-
   private static int distance(Repository repository, Ref from, Ref to) throws IOException {
 
     try (var walk = new RevWalk(repository)) {

src/test/java/org/sonarsource/sonarlint/ls/clientapi/SonarLintVSCodeClientTests.java

@@ -62,8 +62,6 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.sonarsource.sonarlint.core.rpc.client.ConfigScopeNotFoundException;
-import org.sonarsource.sonarlint.core.rpc.client.SonarLintCancelChecker;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.config.binding.BindingSuggestionDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.tracking.ListAllResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.tracking.TaintVulnerabilityDto;
@@ -900,25 +898,6 @@ void shouldForwardShowFixSuggestionRequestToClient_windows() {
     assertThat(argumentCaptor.getValue().textEdits().get(1).before()).isEqualTo("System.out.println(\"Hello, World!\");");
   }
 
-  @Test
-  void shouldMatchProjectBranch() throws ConfigScopeNotFoundException {
-    var configScopeId = "file:///Users/sonarlint-user/project/";
-    var projectBranch = "currentBranch";
-
-    ArgumentCaptor<String> configScopeIdCaptor = ArgumentCaptor.forClass(String.class);
-    ArgumentCaptor<String> projectBranchCaptor = ArgumentCaptor.forClass(String.class);
-    ArgumentCaptor<SonarLintCancelChecker> cancelCheckerArgumentCaptor = ArgumentCaptor.forClass(SonarLintCancelChecker.class);
-
-    SonarLintCancelChecker cancelChecker = new SonarLintCancelChecker(new DummyCancelChecker());
-    underTest.matchProjectBranch(configScopeId, projectBranch,
-      cancelChecker);
-
-    verify(branchManager).matchProjectBranch(configScopeIdCaptor.capture(), projectBranchCaptor.capture(), cancelCheckerArgumentCaptor.capture());
-    assertThat(configScopeIdCaptor.getValue()).isEqualTo(configScopeId);
-    assertThat(projectBranchCaptor.getValue()).isEqualTo(projectBranch);
-    assertThat(cancelCheckerArgumentCaptor.getValue()).isEqualTo(cancelChecker);
-  }
-
   @Test
   @DisabledOnOs(OS.WINDOWS)
   void shouldReturnBaseDir() {

src/test/java/org/sonarsource/sonarlint/ls/folders/WorkspaceFolderBranchManagerTest.java

@@ -137,33 +137,6 @@ void shouldReturnNullOnException() throws IOException {
     assertThat(branch).isNull();
   }
 
-  @Test
-  void isCurrentBranch_shouldReturnTrueWhenCurrentBranch(@TempDir File projectDir) {
-    javaUnzip("closest-branch.zip", projectDir);
-    Path path = Paths.get(projectDir.getPath(), "closest-branch");
-
-    boolean isCurrentBranch = GitUtils.isCurrentBranch(path.toUri().toString(), "current_branch", fakeClientLogger);
-    assertThat(isCurrentBranch).isTrue();
-  }
-
-  @Test
-  void isCurrentBranch_shouldReturnFalseWhenNotCurrentBranch(@TempDir File projectDir) {
-    javaUnzip("closest-branch.zip", projectDir);
-    Path path = Paths.get(projectDir.getPath(), "closest-branch");
-
-    boolean isCurrentBranch = GitUtils.isCurrentBranch(path.toUri().toString(), "not_current_branch", fakeClientLogger);
-    assertThat(isCurrentBranch).isFalse();
-  }
-
-  @Test
-  void isCurrentBranch_shouldReturnFalseWhenNoRepo(@TempDir File projectDir) {
-    javaUnzip("closest-branch.zip", projectDir);
-    Path path = Paths.get(projectDir.getPath(), "non-existent");
-
-    boolean isCurrentBranch = GitUtils.isCurrentBranch(path.toUri().toString(), "not_current_branch", fakeClientLogger);
-    assertThat(isCurrentBranch).isFalse();
-  }
-
   @Test
   void shouldFavorCurrentBranchIfMultipleCandidates(@TempDir File projectDir) {
     // Both main and same-as-master branches are pointing to HEAD, but same-as-master is the currently checked out branch